Change to use pgrep (fixes ubuntu14 ftp tests)

Author: timkimber

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,15 +51,15 @@ 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
 			sleep 1
 			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