From 9209888516da89176d1872b393533607aaff19af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sj=C3=B6gren?= Date: Wed, 16 Mar 2016 19:50:52 +0100 Subject: [PATCH] pgrep docker daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Sjögren --- helper_lib.sh | 2 +- tests/2_docker_daemon_configuration.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helper_lib.sh b/helper_lib.sh index 74c8849..4883bdd 100644 --- a/helper_lib.sh +++ b/helper_lib.sh @@ -41,7 +41,7 @@ contains() { get_command_line_args() { PROC="$1" - for PID in $(pgrep -x -o "$PROC") + for PID in $(pgrep -f -o "$PROC") do tr "\0" " " < /proc/"$PID"/cmdline done diff --git a/tests/2_docker_daemon_configuration.sh b/tests/2_docker_daemon_configuration.sh index f0fc82f..dcbe962 100644 --- a/tests/2_docker_daemon_configuration.sh +++ b/tests/2_docker_daemon_configuration.sh @@ -5,7 +5,7 @@ info "2 - Docker Daemon Configuration" # 2.1 check_2_1="2.1 - Do not use lxc execution driver" -get_command_line_args docker | grep lxc >/dev/null 2>&1 +get_command_line_args "docker daemon" | grep lxc >/dev/null 2>&1 if [ $? -eq 0 ]; then warn "$check_2_1" else