diff options
Diffstat (limited to 'tests/testserver/vsftpd/vsftpd.sh')
| -rwxr-xr-x | tests/testserver/vsftpd/vsftpd.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/testserver/vsftpd/vsftpd.sh b/tests/testserver/vsftpd/vsftpd.sh index 1ba1a8c347..14364f94c2 100755 --- a/tests/testserver/vsftpd/vsftpd.sh +++ b/tests/testserver/vsftpd/vsftpd.sh @@ -41,9 +41,10 @@ useradd -d "/home/$USER/ftp" -s /bin/bash ftptest; echo "ftptest:$PASS" | chpass cp $TESTDATA/vsftpd.{conf,user_list} /etc/ # Resolve error message "vsftpd failed - probably invalid config" during boot -command='start-stop-daemon --start --background -m --oknodo --pidfile /var/run/vsftpd/vsftpd.pid' -command+=' --exec ${DAEMON}' -sed -i "s,$command.*$,$command; sleep 1," /etc/init.d/vsftpd +# This bug has been reported to Debian bug tracking system (ID #911396) +command='ps -C vsftpd | grep -qs "${_PID}"' +sed -i -e 's,while [ ${n} -le 5 ].*$,while true,' \ + -e "s,\t\t\tif ! $command.*$,\t\t\tif $command," /etc/init.d/vsftpd # Populate the FTP sites: su $USER -c "cp -r $TESTDATA/ftp ~/ftp" |