diff --git a/tests/p_tftp-server/0-install_tftp-server.sh b/tests/p_tftp-server/0-install_tftp-server.sh index 57882a4..137d964 100755 --- a/tests/p_tftp-server/0-install_tftp-server.sh +++ b/tests/p_tftp-server/0-install_tftp-server.sh @@ -6,4 +6,4 @@ t_InstallPackage tftp-server xinetd tftp # Enable tftp sed -i 's/\(disable\s*=\ \)yes/\1no/' /etc/xinetd.d/tftp -t_ServiceControl xinetd start +t_ServiceControl xinetd restart diff --git a/tests/p_tftp-server/tftp-server_test.sh b/tests/p_tftp-server/tftp-server_test.sh index a4f82a6..2c98b62 100755 --- a/tests/p_tftp-server/tftp-server_test.sh +++ b/tests/p_tftp-server/tftp-server_test.sh @@ -3,8 +3,15 @@ t_Log "Running $0 - tftp-server get file test." -chmod 777 /var/lib/tftpboot -echo "t_functional_test" > /var/lib/tftpboot/tftp_test +if (t_GetPkgRel basesystem | grep -q el6) +then + TFTP_DIR=/var/lib/tftpboot +else + TFTP_DIR=/tftpboot +fi + +chmod 777 $TFTP_DIR +echo "t_functional_test" > $TFTP_DIR/tftp_test tftp 127.0.0.1 -c get tftp_test cat tftp_test | grep -q 't_functional_test'