denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Copy guest-specific files after default files

Browse Source 
This allows overriding some files per guest.
This commit is contained in:
Tobias Brunner
2023-07-20 15:59:21 +02:00
parent 79ad33bfba
commit 872781734d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-guestimages
+1 -1
View File
@@ -45,8 +45,8 @@ do
execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0 execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0
partprobe $NBDEV partprobe $NBDEV
execute "mount $NBDPARTITION $LOOPDIR" 0 execute "mount $NBDPARTITION $LOOPDIR" 0
execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0 execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0
execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0
execute_chroot "ldconfig" 0 execute_chroot "ldconfig" 0
execute "mkdir $LOOPDIR/etc/pts" 0 execute "mkdir $LOOPDIR/etc/pts" 0
testing/scripts/restore-defaults
+1 -1
View File
@@ -35,7 +35,7 @@ then
for host in `ls $TESTSDIR/${testname}/hosts` for host in `ls $TESTSDIR/${testname}/hosts`
do do
eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`" 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/default/etc $HOSTLOGIN:/ > /dev/null 2>&1
scp $SSHCONF -r $HOSTCONFIGDIR/${host}/etc $HOSTLOGIN:/ > /dev/null 2>&1
done done
fi fi