From: Michael Prokop <mika@grml.org>
Date: Wed, 28 Oct 2009 21:43:48 +0000 (+0100)
Subject: Execute blockdev to reread partition table; replace vol_id with blkid
X-Git-Tag: v0.32~3
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=efc738315b72365a6bb1c10e08beeffb674e99d5;hp=cbf40a49324ae7feb468e528a7845465304faaff

Execute blockdev to reread partition table; replace vol_id with blkid
---

diff --git a/grml-debootstrap b/grml-debootstrap
index bf62ded..2d79d19 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -662,9 +662,19 @@ mkfs() {
 
     if [ -n "$MKFS" ] ; then
        einfo "Running $MKFS on $TARGET"
-       $MKFS $TARGET
-       TARGET_UUID="$(vol_id -u $TARGET 2>/dev/null || echo '')"
-       eend $?
+       $MKFS $TARGET ; RC=$?
+
+       # make sure /dev/disk/by-uuid/... is up2date, otherwise grub
+       # will fail to detect the uuid in the chroot
+       blockdev --rereadpt "${TARGET%%[0-9]*}"
+       # give the system 2 seconds, otherwise we might run into
+       # race conditions :-/
+       sleep 2
+
+       eval $(blkid -o udev $TARGET 2>/dev/null)
+       [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID=""
+
+       eend $RC
     fi
 
   fi