X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;fp=grml-debootstrap;h=19d7a52922195a295226c8789ede2eba267f37bc;hb=9b2cf8303e8e403b1bd9eaa5dbf6f3e795a4f426;hp=97dc26b2b01ba3ede53bac3f6b6b068403157582;hpb=fa44c61d9c8b7a1559d409a0d6f8fbdcb7350cac;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 97dc26b..19d7a52 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1372,10 +1372,28 @@ mkfs() {
       # if we deploy to /dev/sdX# then let's see if /dev/sdX exists
       local main_device="${TARGET%%[0-9]*}"
       # sanity check to not try to e.g. access /dev/loop if we get /dev/loop0
-      if [ -f "/sys/block/$(basename "${main_device}")/$(basename "${TARGET}")/dev" ] ; then
-        blockdev --rereadpt "$main_device"
-      else
+      if ! [ -f "/sys/block/$(basename "${main_device}")/$(basename "${TARGET}")/dev" ] ; then
         einfo "No underlying block device for $TARGET identified, skipping blockdev --rereadpt."
+      else
+        udevadm settle
+        # ensure we give blockdev up to 30 seconds/retries
+        local timeout=30
+        local success=0
+        while [ "$timeout" -gt 0 ] ; do
+          ((timeout--))
+          if blockdev --rereadpt "${main_device}" ; then
+            success=1
+            break
+          else
+            ewarn "Failed to reread partition table of ${main_device} [${timeout} retries left]"
+            sleep 1
+          fi
+        done
+
+        if [ "${success}" = "0" ] ; then
+          eerror "Error: failed to reread partition table, giving up."
+          bailout 1
+        fi
       fi
     fi
     # give the system 2 seconds, otherwise we might run into