From 7c2ef58e86c10e0cf9846dc9211cc68c7e908f7f Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 6 Dec 2012 19:03:45 +0100
Subject: Import testing.conf file in function.sh

This is needed to have access to $LOGFILE and possibly other config
settings.
---
 testing/scripts/install-shared | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'testing/scripts/install-shared')

diff --git a/testing/scripts/install-shared b/testing/scripts/install-shared
index 4cfac9e77..0f961aef9 100755
--- a/testing/scripts/install-shared
+++ b/testing/scripts/install-shared
@@ -17,13 +17,7 @@
 # for more details.
 #
 
-DIR=`dirname $0`
-
-source $DIR/function.sh
-
-[ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found"
-
-source $DIR/../testing.conf
+. $PWD/scripts/function.sh
 
 cecho "installing strongSwan from shared tree"
 cecho-n "  on: "
-- 
cgit v1.2.3


From 9b3316ed2773b276cb9537c4ccde2dd3431b655d Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Fri, 7 Dec 2012 11:48:48 +0100
Subject: Use qemu/KVM virtualization instead of UML

Guest and network configuration is setup using the libvirt
virtualization API. The [start|stop]_testing scripts have been updated
accordingly.

qemu/KVM does not currently support a hostfs, so the shared build tree
mount has been dropped for now.
---
 testing/scripts/install-shared | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100755 testing/scripts/install-shared

(limited to 'testing/scripts/install-shared')

diff --git a/testing/scripts/install-shared b/testing/scripts/install-shared
deleted file mode 100755
index 0f961aef9..000000000
--- a/testing/scripts/install-shared
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Install strongSwan from mounted strongswan-shared tree
-#
-# Copyright (C) 2006 Martin Willi
-# Hochschule fuer Technik Rapperswil
-# Copyright (C) 2004  Eric Marchionni, Patrik Rayo
-# Zuercher Hochschule Winterthur
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 2 of the License, or (at your
-# option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-#
-
-. $PWD/scripts/function.sh
-
-cecho "installing strongSwan from shared tree"
-cecho-n "  on: "
-
-for host in $STRONGSWANHOSTS
-do
-    eval HOSTLOGIN="root@`echo $HOSTNAMEIPV4 | sed -n -e "s/^.*${host},//gp" | awk -F, '{ print $1 }' | awk '{ print $1 }'`"
-    cecho-n "$host... "
-    ssh $HOSTLOGIN 'cd ~/strongswan-shared && make install' > /dev/null
-done
-
-cecho
-- 
cgit v1.2.3