From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 20 Jul 2023 13:28:51 +0000 (+0200)
Subject: testing: Copy guest-specific files after default files
X-Git-Tag: android-2.4.2~22^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=872781734d43fcfae1b78ffa6d9a3f9d5138f17b;p=thirdparty%2Fstrongswan.git

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 cef1a8297b..34cd91fe5c 100755
--- 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 95f3e5d844..0ef08f266f 100755
--- 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