diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-06 18:26:39 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:10 +0100 |
| commit | 261cf0e395ec43634e49e3f431cd189d69f03edc (patch) | |
| tree | d3b94d24c6b8e178a8b8423e838e0f40eaf257e1 /testing/scripts/build-umlhostfs | |
| parent | 2d1577d661c02753ad7c9b34f993a7c340706679 (diff) | |
| download | strongswan-261cf0e395ec43634e49e3f431cd189d69f03edc.tar.bz2 strongswan-261cf0e395ec43634e49e3f431cd189d69f03edc.tar.xz | |
Drop build-hostconfig script
Use processed host configurations directly instead.
Diffstat (limited to 'testing/scripts/build-umlhostfs')
| -rwxr-xr-x | testing/scripts/build-umlhostfs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs index d5b347973..ada9696c7 100755 --- a/testing/scripts/build-umlhostfs +++ b/testing/scripts/build-umlhostfs @@ -25,10 +25,12 @@ DIR=`dirname $0` [ -f $DIR/../testing.conf ] || die "Configuration file 'testing.conf' not found" . $DIR/../testing.conf -cd $BUILDDIR/root-fs BASE=$BUILDDIR/base.img +ROOTFSDIR=$BUILDDIR/root-fs +HOSTSDIR=$DIR/../hosts [ -f $BASE ] || die "Base image $BASE not found" +[ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found" mkdir -p $BUILDDIR mkdir -p $LOOPDIR @@ -42,9 +44,10 @@ fi for host in $HOSTS do log_action "Creating guest image for $host" - execute "cp $BASE $host.img" 0 - execute "mount -o loop $host.img $LOOPDIR" 0 - execute "cp -rf $BUILDDIR/hosts/${host}/etc $LOOPDIR" 0 + execute "cp $BASE $ROOTFSDIR/$host.img" 0 + execute "mount -o loop $ROOTFSDIR/$host.img $LOOPDIR" 0 + execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0 + execute "cp -rf $HOSTSDIR/default/etc $LOOPDIR" 0 if [ "$host" = "winnetou" ] then execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 |