]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
testing: Hardcode /testresults mount point in winnetou's fstab
authorTobias Brunner <tobias@strongswan.org>
Thu, 20 Jul 2023 13:29:35 +0000 (15:29 +0200)
committerTobias Brunner <tobias@strongswan.org>
Thu, 20 Jul 2023 13:59:21 +0000 (15:59 +0200)
Because do-tests runs the restore-defaults script, fstab would get reset
to the default version and the mount point wouldn't be available anymore
after stopping and restarting the guests (unless the guest images were
rebuilt in between).

testing/hosts/winnetou/etc/fstab [new file with mode: 0644]
testing/scripts/build-guestimages

diff --git a/testing/hosts/winnetou/etc/fstab b/testing/hosts/winnetou/etc/fstab
new file mode 100644 (file)
index 0000000..4d5f83d
--- /dev/null
@@ -0,0 +1,3 @@
+/dev/vda1      /                       ext3    defaults,relatime,barrier=1     0       1
+/hostshare /root/shared 9p trans=virtio,version=9p2000.L 0 0
+/testresults /var/www/testresults 9p trans=virtio,version=9p2000.L 0 0
\ No newline at end of file
index 34cd91fe5cba3c5bbd9c6ca9169f95339d1f9b08..e289c08cad5253f1b1526bff10fd3298062c9e1e 100755 (executable)
@@ -62,8 +62,6 @@ do
                execute "cp -rf $DIR/../images $LOOPDIR/var/www/" 0
                execute "cp -rf $DIR/../css $LOOPDIR/var/www/" 0
                execute "mkdir $LOOPDIR/var/www/testresults" 0
-               echo "echo /testresults ... >> $LOOPDIR/etc/fstab" >>$LOGFILE 2>&1
-               echo "/testresults /var/www/testresults 9p trans=virtio,version=9p2000.L 0 0" >> $LOOPDIR/etc/fstab
                execute_chroot "a2enmod -q cgid" 0
                execute_chroot "a2enmod -q rewrite" 0
                execute_chroot "mkdir /var/www/certs" 0