aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtesting/scripts/build-umlrootfs10
-rwxr-xr-xtesting/testing.conf6
2 files changed, 14 insertions, 2 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 84413b908..a61cfbf20 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -226,6 +226,16 @@ then
echo -n " --enable-socket-default" >> $INSTALLSHELL
fi
+if [ "$USE_DHCP" = "yes" ]
+then
+ echo -n " --enable-dhcp" >> $INSTALLSHELL
+fi
+
+if [ "$USE_FARP" = "yes" ]
+then
+ echo -n " --enable-farp" >> $INSTALLSHELL
+fi
+
echo "" >> $INSTALLSHELL
echo "make" >> $INSTALLSHELL
echo "make install" >> $INSTALLSHELL
diff --git a/testing/testing.conf b/testing/testing.conf
index bcbc56da2..3d4510feb 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -19,13 +19,13 @@ UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.32.8.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.33.1.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
# Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.32
+KERNELCONFIG=$UMLTESTDIR/.config-2.6.33
# Bzipped uml patch for kernel
#UMLPATCH=$UMLTESTDIR/aead_init.patch.bz2
@@ -53,6 +53,8 @@ USE_LOAD_TESTS="yes"
USE_TEST_VECTORS="yes"
USE_GCRYPT="yes"
USE_SOCKET_DEFAULT="yes"
+USE_DHCP="yes"
+USE_FARP="yes"
# Gentoo linux root filesystem
ROOTFS=$UMLTESTDIR/gentoo-fs-20090615.tar.bz2