From 3b90477cf36da1f7d2cf7c74603d5fc338bf457d Mon Sep 17 00:00:00 2001 From: Tim Kimber Date: Thu, 25 Nov 2021 12:13:34 +0000 Subject: [PATCH] Change to use pgrep (fixes ubuntu14 ftp tests) --- test/test-config/vsftpd.initd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-config/vsftpd.initd b/test/test-config/vsftpd.initd index d5b2b00..5901ce1 100755 --- a/test/test-config/vsftpd.initd +++ b/test/test-config/vsftpd.initd @@ -39,7 +39,7 @@ case "${1}" in start) log_daemon_msg "Starting FTP server" "${NAME}" - if [ -e /etc/vsftpd.conf ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" /etc/vsftpd.conf + if [ -e /etc/vsftpd.conf ] && ! grep -Eiq "^ *listen(_ipv6)? *= *yes" /etc/vsftpd.conf then log_warning_msg "vsftpd disabled - listen disabled in config." exit 0 @@ -51,7 +51,7 @@ case "${1}" in while [ ${n} -le 5 ] do _PID="$(if [ -e /var/run/vsftpd/vsftpd.pid ]; then cat /var/run/vsftpd/vsftpd.pid; fi)" - if ! ps -C vsftpd | grep -qs "${_PID}" + if pgrep vsftpd --pidfile /var/run/vsftpd/vsftpd.pid >/dev/null then break fi @@ -59,7 +59,7 @@ case "${1}" in n=$(( $n + 1 )) done - if ps -C vsftpd | grep -qs "${_PID}" + if ! pgrep vsftpd --pidfile /var/run/vsftpd/vsftpd.pid >/dev/null then log_warning_msg "vsftpd failed - probably invalid config." exit 1