testing: Use blockdev instead of partprobe to load partitions

This avoids a dependency on parted as blockdev is in util-linux on
Debian/Ubuntu, which is installed by default.  And it might work more
reliably.

diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index a96f01f8fe6e43cd13111408a578134b34649f5c..151a1fafb6679c089e3ad4e667990fae8992def1 100755 (executable)
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -9,7 +9,7 @@ DIR=$(dirname `readlink -f $0`)
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
 running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
-check_commands debootstrap mkfs.ext3 partprobe qemu-img qemu-nbd sfdisk
+check_commands debootstrap mkfs.ext3 blockdev qemu-img qemu-nbd sfdisk
 
 # package includes/excludes
 INC=automake,autoconf,libtool,bison,flex,gperf,pkg-config,gettext,less,locales
@@ -97,7 +97,7 @@ then
 else
        log_status 0
 fi
-partprobe $NBDEV
+blockdev --rereadpt $NBDEV
 
 log_action "Creating ext3 filesystem"
 execute "mkfs.ext3 $NBDPARTITION"

diff --git a/testing/scripts/build-certs b/testing/scripts/build-certs
index 464b69c32441c86c6166b5d19381b96dabc7fee4..a8648033ce03d45ac5c331043a16f9cb26458af1 100755 (executable)
--- a/testing/scripts/build-certs
+++ b/testing/scripts/build-certs
@@ -12,7 +12,7 @@ running_any $STRONGSWANHOSTS && die "Please stop test environment before running
 SRCUID=${SUDO_UID:-$(id -u)}
 SRCGID=${SUDO_GID:-$(id -g)}
 
-check_commands partprobe qemu-img qemu-nbd bindfs
+check_commands blockdev qemu-img qemu-nbd bindfs
 
 load_qemu_nbd
 
@@ -22,7 +22,7 @@ mkdir -p $IMGDIR
 log_action "Connecting root image to NBD device $NBDEV"
 execute "qemu-nbd -c $NBDEV $ROOTIMG"
 do_on_exit qemu-nbd -d $NBDEV
-partprobe $NBDEV
+blockdev --rereadpt $NBDEV
 
 log_action "Mounting $NBDPARTITION to $LOOPDIR"
 execute "mount $NBDPARTITION $LOOPDIR"

diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages
index e289c08cad5253f1b1526bff10fd3298062c9e1e..5050b3748268f2839537581de00c0e30389f634d 100755 (executable)
--- a/testing/scripts/build-guestimages
+++ b/testing/scripts/build-guestimages
@@ -27,7 +27,7 @@ HOSTSDIR=$DIR/../hosts
 [ -f $HOSTDIR ] || die "Hosts directory $HOSTSDIR not found"
 running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
-check_commands partprobe qemu-img qemu-nbd
+check_commands blockdev qemu-img qemu-nbd
 
 load_qemu_nbd
 
@@ -43,7 +43,7 @@ do
        log_action "Creating guest image for $host"
        execute "qemu-img create -b $ROOTIMG -f $IMGEXT -F $IMGEXT $IMGDIR/$host.$IMGEXT" 0
        execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0
-       partprobe $NBDEV
+       blockdev --rereadpt $NBDEV
        execute "mount $NBDPARTITION $LOOPDIR" 0
        execute "cp -rf $HOSTSDIR/default/* $LOOPDIR" 0
        execute "cp -rf $HOSTSDIR/${host}/etc $LOOPDIR" 0

diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index d51ffddbfbb6592884934d4eb40497d20041d10a..772c92da7309f594e1ceec5d676161bbe28f097f 100755 (executable)
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -8,7 +8,7 @@ DIR=$(dirname `readlink -f $0`)
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 running_any $STRONGSWANHOSTS && die "Please stop test environment before running $0"
 
-check_commands partprobe qemu-img qemu-nbd
+check_commands blockdev qemu-img qemu-nbd
 
 load_qemu_nbd
 
@@ -115,7 +115,7 @@ case "$GUEST" in
 esac
 
 do_on_exit qemu-nbd -d $NBDEV
-partprobe $NBDEV
+blockdev --rereadpt $NBDEV
 
 log_action "Mounting $NBDPARTITION to $LOOPDIR"
 execute "mount $NBDPARTITION $LOOPDIR"

diff --git a/testing/scripts/chroot b/testing/scripts/chroot
index 665a6bae2ebe6f48587cb78970a1441d8707074a..60a75df7e70b6cee850a9e1a4adbbb097bd9ebc9 100755 (executable)
--- a/testing/scripts/chroot
+++ b/testing/scripts/chroot
@@ -9,7 +9,7 @@ running_any $STRONGSWANHOSTS && die "Please stop test environment before running
 
 [ -n "$1" ] || die "$0 <image to mount: base|root|<guest>>"
 
-check_commands partprobe qemu-nbd
+check_commands blockdev qemu-nbd
 
 load_qemu_nbd
 
@@ -42,7 +42,7 @@ root)
 esac
 
 do_on_exit qemu-nbd -d $NBDEV
-partprobe $NBDEV
+blockdev --rereadpt $NBDEV
 
 log_action "Mounting $NBDPARTITION to $LOOPDIR"
 execute "mount $NBDPARTITION $LOOPDIR"