diff options
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-baseimage | 2 | ||||
| -rwxr-xr-x | testing/scripts/build-guestimages | 7 | ||||
| -rwxr-xr-x | testing/scripts/build-rootimage | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 85b3d3175..81460d91c 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -21,8 +21,8 @@ CACHEDIR=$BUILDDIR/cache APTCACHE=$LOOPDIR/var/cache/apt/archives mkdir -p $LOOPDIR -mkdir -p $BUILDDIR mkdir -p $CACHEDIR +mkdir -p $IMGDIR rm -f $BASEIMG echo "`date`, building $BASEIMG" >>$LOGFILE diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index cf64bd86d..d07981a17 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -28,9 +28,8 @@ check_commands partprobe qemu-img qemu-nbd load_qemu_nbd -mkdir -p $BUILDDIR +mkdir -p $IMGDIR mkdir -p $LOOPDIR -mkdir -p $GUESTIMGDIR # just to be sure do_on_exit qemu-nbd -d $NBDEV @@ -39,8 +38,8 @@ do_on_exit umount $LOOPDIR for host in $STRONGSWANHOSTS do log_action "Creating guest image for $host" - execute "qemu-img create -b $ROOTIMG -f $IMGEXT $GUESTIMGDIR/$host.$IMGEXT" 0 - execute "qemu-nbd -c $NBDEV $GUESTIMGDIR/$host.$IMGEXT" 0 + execute "qemu-img create -b $ROOTIMG -f $IMGEXT $IMGDIR/$host.$IMGEXT" 0 + execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0 partprobe $NBDEV execute "mount $NBDPARTITION $LOOPDIR" 0 execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0 diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage index 8d3f32bbc..b575ebb50 100755 --- a/testing/scripts/build-rootimage +++ b/testing/scripts/build-rootimage @@ -27,6 +27,7 @@ load_qemu_nbd mkdir -p $LOOPDIR mkdir -p $ROOTIMGCOMPILEDIR +mkdir -p $IMGDIR log_action "Creating root image $ROOTIMG" execute "qemu-img create -b $BASEIMG -f $IMGEXT $ROOTIMG" |