testing: Copy guest-specific files after default files

This allows overriding some files per guest.

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index cef1a8297bc3883607b012784b996c37ea1be660..34cd91fe5cba3c5bbd9c6ca9169f95339d1f9b08 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -45,8 +45,8 @@ do
        execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0
        partprobe $NBDEV
        execute "mount $NBDPARTITION $LOOPDIR" 0
-       execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
        execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0
+       execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
        execute_chroot "ldconfig" 0
        execute "mkdir $LOOPDIR/etc/pts" 0
 

diff --git a/testing/scripts/restore-defaults b/testing/scripts/restore-defaults
index 95f3e5d84421ccf8433014be99c07c901bc6b774..0ef08f266fb20dde5930d82e71e89649b4a715ef 100755 (executable)
--- a/testing/scripts/restore-defaults
+++ b/testing/scripts/restore-defaults
@@ -35,7 +35,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 $SSHCONF -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
                scp $SSHCONF -r $HOSTCONFIGDIR/default/etc $HOSTLOGIN:/ > /dev/null 2>&1
+               scp $SSHCONF -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
        done
 fi