summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'testing/scripts')
-rwxr-xr-xtesting/scripts/build-guestimages4
-rw-r--r--testing/scripts/recipes/013_strongswan.mk3
2 files changed, 6 insertions, 1 deletions
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index e2ec422b1..43a71b921 100755
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -60,7 +60,11 @@ do
then
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0
execute "cp -rf $DIR/../images $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 "ln -s /etc/openssl/certs /var/www/certs" 0
execute_chroot "/etc/openssl/generate-crl" 0
execute_chroot "rm -rf /var/lib/ldap/*" 0
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index f205df33b..5c4fdd829 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -99,7 +99,8 @@ CONFIG_OPTS = \
--enable-ntru \
--enable-lookip \
--enable-bliss \
- --enable-sha3
+ --enable-sha3 \
+ --enable-newhope
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat