From 261cf0e395ec43634e49e3f431cd189d69f03edc Mon Sep 17 00:00:00 2001 From: Reto Buerki Date: Thu, 6 Dec 2012 18:26:39 +0100 Subject: Drop build-hostconfig script Use processed host configurations directly instead. --- testing/scripts/build-umlhostfs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'testing/scripts/build-umlhostfs') 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 -- cgit v1.2.3