diff options
| -rwxr-xr-x | testing/scripts/build-umlhostfs | 4 | ||||
| -rwxr-xr-x | testing/scripts/load-testconfig | 2 | ||||
| -rwxr-xr-x | testing/scripts/restore-defaults | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs index 3e6337124..d61d5f47d 100755 --- a/testing/scripts/build-umlhostfs +++ b/testing/scripts/build-umlhostfs @@ -65,11 +65,11 @@ do cecho-n "$host.." cp gentoo-fs gentoo-fs-$host mount -o loop gentoo-fs-$host $LOOPDIR - cp -rfp $BUILDDIR/hosts/${host}/etc $LOOPDIR + cp -rf $BUILDDIR/hosts/${host}/etc $LOOPDIR if [ "$host" = "winnetou" ] then mkdir $LOOPDIR/var/log/apache2/ocsp - cp -rfp $UMLTESTDIR/testing/images $LOOPDIR/var/www/localhost/htdocs + cp -rf $UMLTESTDIR/testing/images $LOOPDIR/var/www/localhost/htdocs chroot $LOOPDIR ln -s /etc/openssl/certs /var/www/localhost/htdocs/certs chroot $LOOPDIR /etc/openssl/generate-crl >> $LOGFILE 2>&1 fi diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig index 2c333221f..48f88c282 100755 --- a/testing/scripts/load-testconfig +++ b/testing/scripts/load-testconfig @@ -47,7 +47,7 @@ then for host in `ls $TESTSDIR/$testname/hosts` do eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`" - scp -rp $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1 + scp -r $TESTSDIR/$testname/hosts/$host/etc $HOSTLOGIN:/ > /dev/null 2>&1 done fi diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults index 4bb81d19e..06d1eeb67 100755 --- a/testing/scripts/restore-defaults +++ b/testing/scripts/restore-defaults @@ -48,6 +48,6 @@ then for host in `ls $TESTSDIR/${testname}/hosts` do eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`" - scp -rp $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1 + scp -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1 done fi |