fe29a6a6eb
This appears to be a timing issue of vsftpd's initial script
(/etc/init.d/vsftpd). When starting the vsftpd service, the script uses
a while loop to make sure that the vsftpd process has been created with
the expected PID. The problem is that it should sleep if it can't grep
the same PID via ps command.
while [ ${n} -le 5 ]
do
_PID="$(if [ -e ...vsftpd.pid ]; then cat ...vsftpd.pid; fi)"
if ! ps -C vsftpd | grep -qs "${_PID}"
then
break
fi
sleep 1
n=$(( $n + 1 ))
done
if ! ps -C vsftpd | grep -qs "${_PID}"
then
log_warning_msg "vsftpd failed - probably invalid config."
exit 1
fi
However, synchronization based on time is not working in general. This
change will rewrite the while loop to an infinite loop and remove the
exclamation symbol (!) from the if condition.
Upgrading the version of vsftpd is not helpful here because
vsftpd_3.0.3-11 (Ubuntu 18.10) didn't resolve it yet.
Change-Id: I07382709c33bd9bab61fcea76ab7deca5f630084
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
68 lines
2.5 KiB
Bash
Executable File
68 lines
2.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
#############################################################################
|
|
##
|
|
## Copyright (C) 2018 The Qt Company Ltd.
|
|
## Contact: https://www.qt.io/licensing/
|
|
##
|
|
## This file is part of the test suite of the Qt Toolkit.
|
|
##
|
|
## $QT_BEGIN_LICENSE:GPL$
|
|
## Commercial License Usage
|
|
## Licensees holding valid commercial Qt licenses may use this file in
|
|
## accordance with the commercial license agreement provided with the
|
|
## Software or, alternatively, in accordance with the terms contained in
|
|
## a written agreement between you and The Qt Company. For licensing terms
|
|
## and conditions see https://www.qt.io/terms-conditions. For further
|
|
## information use the contact form at https://www.qt.io/contact-us.
|
|
##
|
|
## GNU General Public License Usage
|
|
## Alternatively, this file may be used under the terms of the GNU
|
|
## General Public License version 3 or (at your option) any later version
|
|
## approved by the KDE Free Qt Foundation. The licenses are as published by
|
|
## the Free Software Foundation and appearing in the file LICENSE.GPL3
|
|
## included in the packaging of this file. Please review the following
|
|
## information to ensure the GNU General Public License requirements will
|
|
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
##
|
|
## $QT_END_LICENSE$
|
|
##
|
|
#############################################################################
|
|
|
|
set -ex
|
|
|
|
# package vsftpd
|
|
|
|
# add users
|
|
usermod -d "/home/$USER/ftp/" ftp #existing user
|
|
useradd -d "/home/$USER/ftp" -s /bin/bash ftptest; echo "ftptest:$PASS" | chpasswd
|
|
|
|
# install configurations and test data
|
|
cp $TESTDATA/vsftpd.{conf,user_list} /etc/
|
|
|
|
# Resolve error message "vsftpd failed - probably invalid config" during boot
|
|
# 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"
|
|
ln -s /home/$USER/ftp /var/ftp
|
|
|
|
# tst_QNetworkReply::getFromFtp_data()
|
|
su $USER -c "mkdir -p ~/ftp/qtest/"
|
|
su $USER -c "cp rfc3252.txt ~/ftp/qtest/"; rm rfc3252.txt
|
|
|
|
# Duplicate rfc3252.txt 20 times for bigfile tests:
|
|
su $USER -c "seq 20 | xargs -i cat ~/ftp/qtest/rfc3252.txt >> ~/ftp/qtest/bigfile"
|
|
|
|
# tst_QNetworkReply::getErrors_data(), testdata with special permissions
|
|
su $USER -c "chmod 0600 ~/ftp/pub/file-not-readable.txt"
|
|
|
|
# Shared FTP folder (sticky bit)
|
|
su $USER -c "mkdir -p -m 1777 ~/ftp/qtest/upload" # FTP incoming dir
|
|
|
|
# enable service with installed configurations
|
|
service vsftpd restart
|