more robust image setup

Author: b3nn0

image/mk_europe_edition.sh

@@ -32,11 +32,11 @@ sizelimit=$(( 512*sizelimit ))
 # Append one GB and truncate to size
 #truncate -s 2600M $IMGNAME
 qemu-img resize $IMGNAME 2500M
-losetup -f
-losetup /dev/loop0 $IMGNAME
-partprobe /dev/loop0
-e2fsck -f /dev/loop0p2
-fdisk /dev/loop0 <<EOF
+lo=$(losetup -f)
+losetup $lo $IMGNAME
+partprobe $lo
+e2fsck -f ${lo}p2
+fdisk $lo <<EOF
 p
 d
 2
@@ -48,9 +48,9 @@ $sector
 p
 w
 EOF
-partprobe /dev/loop0
-resize2fs -p /dev/loop0p2
-losetup -d /dev/loop0
+partprobe $lo
+resize2fs -p ${lo}p2
+losetup -d $lo
 
 
 

image/mk_europe_edition_device_setup.sh

@@ -29,8 +29,12 @@ rm -r /proc/*
 rm -r /root/fake
 
 # For some reason, qemu build fails unless we use a single compilation thread. Compilation takes quite long...
+# It also rarely crashes with one process, so the important commands are executed multiple times. Once succeeded, execution will be very fast
+# so the performance overhead should be marginal.
 export GOMAXPROCS=1
 go get -u github.com/kidoman/embd/embd
+go get -u github.com/kidoman/embd/embd
+go get -u github.com/kidoman/embd/embd
 make clean
 # Sometimes go build fails for some reason.. we will just try three times and hope for the best
 make