diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-14 11:38:52 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:58 +0100 |
| commit | 482d3ec9ffa8ed6bcb4d7a3ac963b7e705c85c02 (patch) | |
| tree | 2ca01c10dc14167b8d3d22605045b12d85c810c1 | |
| parent | 58e0b386eabc7e84bd706dd6131d83d3d6b7841a (diff) | |
| download | strongswan-482d3ec9ffa8ed6bcb4d7a3ac963b7e705c85c02.tar.bz2 strongswan-482d3ec9ffa8ed6bcb4d7a3ac963b7e705c85c02.tar.xz | |
Also restore 'default' host configuration
| -rwxr-xr-x | testing/scripts/restore-defaults | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults index 16714db26..88d4f87a0 100755 --- a/testing/scripts/restore-defaults +++ b/testing/scripts/restore-defaults @@ -16,10 +16,6 @@ . $PWD/scripts/function.sh -########################################################################## -# load-testconfig requires a testname as an argument -# - testname=$1 HOSTCONFIGDIR=$PWD/hosts @@ -29,11 +25,7 @@ TESTSDIR=$BUILDDIR/tests [ -d $TESTSDIR/$testname ] || die "Test '$testname' not found" [ -f $TESTSDIR/$testname/test.conf ] || die "File 'test.conf' is missing" -source $TESTSDIR/$testname/test.conf - -########################################################################## -# copy default host config back if necessary -# +. $TESTSDIR/$testname/test.conf if [ -d $TESTSDIR/${testname}/hosts ] then @@ -41,5 +33,6 @@ then do eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`" scp $SSHCONF -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1 + scp $SSHCONF -r $HOSTCONFIGDIR/default/etc $HOSTLOGIN:/ > /dev/null 2>&1 done fi |