diff options
| author | Reto Buerki <reet@codelabs.ch> | 2012-12-09 10:23:37 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:54 +0100 |
| commit | 97265abaf0265d0cc59fb1be02e3239fca3daae3 (patch) | |
| tree | 1d73c8f05f7b17c30291caf3cea4f05f553f9298 /testing/scripts | |
| parent | b24d3ed5fc5ad891d7d210bba9b94dbe0a1468ff (diff) | |
| download | strongswan-97265abaf0265d0cc59fb1be02e3239fca3daae3.tar.bz2 strongswan-97265abaf0265d0cc59fb1be02e3239fca3daae3.tar.xz | |
Inform kernel about /dev/nbd0 partition changes
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-baseimage | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-umlhostfs | 4 | ||||
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 31205bf20..81dd6f0a4 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -6,7 +6,7 @@ echo "Building base image" [ `id -u` -eq 0 ] || die "You must be root to run $0" -check_commands debootstrap mkfs.ext3 qemu-img qemu-nbd sfdisk +check_commands debootstrap mkfs.ext3 partprobe qemu-img qemu-nbd sfdisk # additional packages EXTRAS=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core @@ -30,7 +30,6 @@ execute "qemu-img create -f qcow2 $ROOTFS ${ROOTFSSIZE}M" log_action "Connecting image to NBD device $NBDEV" execute "qemu-nbd -c $NBDEV $ROOTFS" -sync log_action "Partitioning disk" sfdisk /dev/nbd0 -D -uM >>$LOGFILE 2>&1 << EOF @@ -43,6 +42,7 @@ then else log_status 0 fi +partprobe $NBDEV log_action "Creating ext3 filesystem" execute "mkfs.ext3 $NBDPARTITION" diff --git a/testing/scripts/build-umlhostfs b/testing/scripts/build-umlhostfs index f53410385..d3cb2f651 100755 --- a/testing/scripts/build-umlhostfs +++ b/testing/scripts/build-umlhostfs @@ -26,7 +26,7 @@ HOSTSDIR=$PWD/hosts [ -f $BASE ] || die "Base image $BASE not found" [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found" -check_commands qemu-img qemu-nbd +check_commands partprobe qemu-img qemu-nbd load_qemu_nbd @@ -47,7 +47,7 @@ do log_action "Creating guest image for $host" execute "qemu-img create -b $BASE -f qcow2 $ROOTFSDIR/$host.qcow2" 0 execute "qemu-nbd -c $NBDEV $ROOTFSDIR/$host.qcow2" 0 - sync + partprobe $NBDEV execute "mount $NBDPARTITION $LOOPDIR" 0 execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0 execute "cp -rf $HOSTSDIR/default/etc $LOOPDIR" 0 diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs index 0f8781c25..6131c1d1c 100755 --- a/testing/scripts/build-umlrootfs +++ b/testing/scripts/build-umlrootfs @@ -22,7 +22,7 @@ echo "Building root image" [ -f "$ROOTFS" ] || die "Root image $ROOTFS not found" -check_commands qemu-nbd +check_commands partprobe qemu-nbd load_qemu_nbd @@ -37,7 +37,7 @@ execute "cp $ROOTFS $BASE" log_action "Connecting base image to NBD device $NBDEV" execute "qemu-nbd -c $NBDEV $BASE" -sync +partprobe $NBDEV log_action "Mounting $NBDPARTITION to $LOOPDIR" execute "mount $NBDPARTITION $LOOPDIR" |