diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-10 10:05:02 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:55 +0100 |
| commit | 258cbd40cff463f4adb57f40d3338e460c7e90f2 (patch) | |
| tree | 583071ab62498bf3213861a09e676e3f22d94b48 /testing/scripts/build-baseimage | |
| parent | aba43136c262151b3f213a2253eddc62a07c7e88 (diff) | |
| download | strongswan-258cbd40cff463f4adb57f40d3338e460c7e90f2.tar.bz2 strongswan-258cbd40cff463f4adb57f40d3338e460c7e90f2.tar.xz | |
Unify naming of base,root image settings
Diffstat (limited to 'testing/scripts/build-baseimage')
| -rwxr-xr-x | testing/scripts/build-baseimage | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 915d1102a..5bf727fbf 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -23,17 +23,17 @@ APTCACHE=$LOOPDIR/var/cache/apt/archives mkdir -p $LOOPDIR mkdir -p $BUILDDIR mkdir -p $CACHEDIR -rm -f $ROOTFS +rm -f $BASEIMG -echo "`date`, building $ROOTFS" >>$LOGFILE +echo "`date`, building $BASEIMG" >>$LOGFILE load_qemu_nbd -log_action "Creating image $ROOTFS" -execute "qemu-img create -f qcow2 $ROOTFS ${ROOTFSSIZE}M" +log_action "Creating base image $BASEIMG" +execute "qemu-img create -f $IMGEXT $BASEIMG ${BASEIMGSIZE}M" log_action "Connecting image to NBD device $NBDEV" -execute "qemu-nbd -c $NBDEV $ROOTFS" +execute "qemu-nbd -c $NBDEV $BASEIMG" do_on_exit qemu-nbd -d $NBDEV log_action "Partitioning disk" @@ -61,8 +61,8 @@ mkdir -p $APTCACHE execute "mount -o bind $CACHEDIR $APTCACHE" do_on_exit graceful_umount $APTCACHE -log_action "Running debootstrap ($ROOTFSSUITE, $ROOTFSARCH)" -execute "debootstrap --arch=$ROOTFSARCH --include=$INC --exclude $EXC $ROOTFSSUITE $LOOPDIR $ROOTFSMIRROR" +log_action "Running debootstrap ($BASEIMGSUITE, $BASEIMGARCH)" +execute "debootstrap --arch=$BASEIMGARCH --include=$INC --exclude $EXC $BASEIMGSUITE $LOOPDIR $BASEIMGMIRROR" for service in $SERVICES do |