summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2012-06-28 21:16:07 +0200
committerYves-Alexis Perez <corsac@corsac.net>2012-06-28 21:16:07 +0200
commitb34738ed08c2227300d554b139e2495ca5da97d6 (patch)
tree62f33b52820f2e49f0e53c0f8c636312037c8054 /testing/scripts
parent0a9d51a49042a68daa15b0c74a2b7f152f52606b (diff)
downloadvyos-strongswan-b34738ed08c2227300d554b139e2495ca5da97d6.tar.gz
vyos-strongswan-b34738ed08c2227300d554b139e2495ca5da97d6.zip
Imported Upstream version 4.6.4
Diffstat (limited to 'testing/scripts')
-rwxr-xr-xtesting/scripts/build-umlrootfs50
-rwxr-xr-xtesting/scripts/load-testconfig4
2 files changed, 52 insertions, 2 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 182feab7d..4c066001c 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -192,6 +192,11 @@ then
echo -n " --enable-eap-tnc" >> $INSTALLSHELL
fi
+if [ "$USE_TNC_PDP" = "yes" ]
+then
+ echo -n " --enable-tnc-pdp" >> $INSTALLSHELL
+fi
+
if [ "$USE_TNC_IMC" = "yes" ]
then
echo -n " --enable-tnc-imc" >> $INSTALLSHELL
@@ -217,6 +222,36 @@ then
echo -n " --enable-tnccs-dynamic" >> $INSTALLSHELL
fi
+if [ "$USE_IMC_TEST" = "yes" ]
+then
+ echo -n " --enable-imc-test" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IMV_TEST" = "yes" ]
+then
+ echo -n " --enable-imv-test" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IMC_SCANNER" = "yes" ]
+then
+ echo -n " --enable-imc-scanner" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IMV_SCANNER" = "yes" ]
+then
+ echo -n " --enable-imv-scanner" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IMC_ATTESTATION" = "yes" ]
+then
+ echo -n " --enable-imc-attestation" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IMV_ATTESTATION" = "yes" ]
+then
+ echo -n " --enable-imv-attestation" >> $INSTALLSHELL
+fi
+
if [ "$USE_SQL" = "yes" ]
then
echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
@@ -307,6 +342,11 @@ then
echo -n " --enable-gcm" >> $INSTALLSHELL
fi
+if [ "$USE_CMAC" = "yes" ]
+then
+ echo -n " --enable-cmac" >> $INSTALLSHELL
+fi
+
if [ "$USE_HA" = "yes" ]
then
echo -n " --enable-ha" >> $INSTALLSHELL
@@ -322,6 +362,16 @@ then
echo -n " --enable-whitelist" >> $INSTALLSHELL
fi
+if [ "$USE_PKCS8" = "yes" ]
+then
+ echo -n " --enable-pkcs8" >> $INSTALLSHELL
+fi
+
+if [ "$USE_IFMAP" = "yes" ]
+then
+ echo -n " --enable-tnc-ifmap" >> $INSTALLSHELL
+fi
+
if [ "$USE_CISCO_QUIRKS" = "yes" ]
then
echo -n " --enable-cisco-quirks" >> $INSTALLSHELL
diff --git a/testing/scripts/load-testconfig b/testing/scripts/load-testconfig
index 0e167e8e2..43100dbe0 100755
--- a/testing/scripts/load-testconfig
+++ b/testing/scripts/load-testconfig
@@ -63,12 +63,12 @@ done
##########################################################################
-# clear radius.log on FreeRadius servers
+# clear radius.log and daemon.log on FreeRadius servers
#
for host in $RADIUSHOSTS
do
eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
- ssh $SSHCONF $HOSTLOGIN 'rm -f /var/log/radius/radius.log; \
+ ssh $SSHCONF $HOSTLOGIN 'rm -f /var/log/radius/radius.log /var/log/daemon.log; \
kill -SIGHUP `cat /var/run/syslogd.pid`' > /dev/null 2>&1
done