denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Explicitly encode backing image format in metadata

Browse Source 
Apparently, there is no probing anymore in newer versions of qemu due
to security considerations.
This commit is contained in:
Tobias Brunner
2021-01-08 11:39:44 +01:00
committed by Andreas Steffen
parent fcb595f961
commit fde5374a86
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-guestimages
+1 -1
View File
@@ -41,7 +41,7 @@ do_on_exit umount $LOOPDIR
for host in $STRONGSWANHOSTS for host in $STRONGSWANHOSTS
do do
log_action "Creating guest image for $host" log_action "Creating guest image for $host"
execute "qemu-img create -b $ROOTIMG -f $IMGEXT $IMGDIR/$host.$IMGEXT" 0 execute "qemu-img create -b $ROOTIMG -f $IMGEXT -F $IMGEXT $IMGDIR/$host.$IMGEXT" 0
execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0 execute "qemu-nbd -c $NBDEV $IMGDIR/$host.$IMGEXT" 0
partprobe $NBDEV partprobe $NBDEV
execute "mount $NBDPARTITION $LOOPDIR" 0 execute "mount $NBDPARTITION $LOOPDIR" 0
testing/scripts/build-strongswan
+1 -1
View File
@@ -96,7 +96,7 @@ case "$GUEST" in
"") "")
if [ ! -f "$ROOTIMG" -o "$REPLACE" ]; then if [ ! -f "$ROOTIMG" -o "$REPLACE" ]; then
log_action "Creating root image $ROOTIMG" log_action "Creating root image $ROOTIMG"
execute "qemu-img create -b $BASEIMG -f $IMGEXT $ROOTIMG" execute "qemu-img create -b $BASEIMG -f $IMGEXT -F $IMGEXT $ROOTIMG"
ALL_RECIPES=1 ALL_RECIPES=1
fi fi
log_action "Connecting root image to NBD device $NBDEV" log_action "Connecting root image to NBD device $NBDEV"