summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2008-03-30 08:31:24 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2008-03-30 08:31:24 +0000
commit1c088a8b6237ec67f63c23f97a0f2dc4e99af869 (patch)
tree7fff7c8329d19bbaa910312e746a116f28fbfaf5 /testing/scripts
parentbcc8f7ca7fd8e8ff6e8a4d579251458313133598 (diff)
downloadvyos-strongswan-1c088a8b6237ec67f63c23f97a0f2dc4e99af869.tar.gz
vyos-strongswan-1c088a8b6237ec67f63c23f97a0f2dc4e99af869.zip
[svn-upgrade] Integrating new upstream version, strongswan (4.1.11)
Diffstat (limited to 'testing/scripts')
-rwxr-xr-xtesting/scripts/build-umlrootfs7
-rwxr-xr-xtesting/scripts/kstart-umls8
2 files changed, 13 insertions, 2 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index b205f62a6..48d74950f 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -14,7 +14,7 @@
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
-# RCSID $Id: build-umlrootfs 3404 2007-12-19 00:47:56Z andreas $
+# RCSID $Id: build-umlrootfs 3471 2008-02-14 21:25:38Z andreas $
DIR=`dirname $0`
@@ -146,6 +146,11 @@ then
echo -n " --enable-eap-aka" >> $INSTALLSHELL
fi
+if [ "$USE_EAP_SIM" = "yes" ]
+then
+ echo -n " --enable-eap-sim" >> $INSTALLSHELL
+ fi
+
if [ "$USE_P2P" = "yes" ]
then
echo -n " --enable-p2p" >> $INSTALLSHELL
diff --git a/testing/scripts/kstart-umls b/testing/scripts/kstart-umls
index 91ec00b60..b953ddeac 100755
--- a/testing/scripts/kstart-umls
+++ b/testing/scripts/kstart-umls
@@ -14,7 +14,7 @@
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
-# RCSID $Id: kstart-umls 3273 2007-10-08 20:18:34Z andreas $
+# RCSID $Id: kstart-umls 3470 2008-02-14 21:24:54Z andreas $
DIR=`dirname $0`
@@ -116,6 +116,12 @@ do
else
cgecho "up"
fi
+
+ if [ "$host" = "alice" ]
+ then
+ eval ipv4_${host}="`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
+ ssh $ipv4_alice /etc/init.d/net.eth1 stop
+ fi
done
cecho " * All uml instances are up now"