Return-Path: From: Wang Mingyu Date: Mon, 11 Feb 2019 23:15:30 -0800 Message-ID: <1549955730-60410-2-git-send-email-wangmy@cn.fujitsu.com> In-Reply-To: <1549955730-60410-1-git-send-email-wangmy@cn.fujitsu.com> References: <1549955730-60410-1-git-send-email-wangmy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Fuego] [PATCH] Modify the function exec_service_on_target to get status of service. List-Id: Mailing list for the Fuego test framework List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: fuego@lists.linuxfoundation.org Signed-off-by: Wang Mingyu --- scripts/fuego_board_function_lib.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/scripts/fuego_board_function_lib.sh b/scripts/fuego_board_function_lib.sh index 4c29bf3..eb9d877 100644 --- a/scripts/fuego_board_function_lib.sh +++ b/scripts/fuego_board_function_lib.sh @@ -11,6 +11,7 @@ init_manager="init_manager-not-set" logger_service="logger_service-not-set" +service_status="service-not-running" # set_init_manager: # detects and sets the init_manager variable, which indicates which @@ -40,11 +41,27 @@ detect_logger_service() { # $1: service name # $2: action to perform (e.g. start, stop, restart) # relies on $init_manager being set prior to call +# returns: status of service exec_service_on_target() { if [ "$init_manager" = "systemd" ] then - systemctl $2 $1 + if [ "$2" = "status" ] + then + service_status=$(systemctl is-active $1) + else + systemctl $2 $1 + fi else - /etc/init.d/$1 $2 + if [ "$2" = "status" ] + then + if /etc/init.d/$1 status | grep "is running" + then + service_status="active" + fi + else +# service $1 $2 + /etc/init.d/$1 $2 + fi fi + echo $service_status } -- 1.8.3.1