Also restore 'default' host configuration

diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index 16714db..88d4f87 100755 (executable)
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -16,10 +16,6 @@
 
 . $PWD/scripts/function.sh
 
 
 . $PWD/scripts/function.sh
 

-##########################################################################
-# load-testconfig requires a testname as an argument
-#
-

 testname=$1
 
 HOSTCONFIGDIR=$PWD/hosts
 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"
 
 [ -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
 
 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
     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
     done
 fi