From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 14 Dec 2012 10:38:52 +0000 (+0100)
Subject: Also restore 'default' host configuration
X-Git-Tag: 5.0.2rc1~1^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482d3ec9ffa8ed6bcb4d7a3ac963b7e705c85c02;p=thirdparty%2Fstrongswan.git

Also restore 'default' host configuration
---

diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index 16714db263..88d4f87a00 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