From: Michael Prokop <mika@grml.org>
Date: Mon, 13 Oct 2014 12:50:56 +0000 (+0200)
Subject: Always use UUIDs for GRUB booting in VMs instead of hardcoding values
X-Git-Tag: v0.67~7
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=af35272c39448d7b94d46a79735d379c688a4174;hp=a2b19f17d05810eb20667ced83135a0a4a049940;ds=sidebyside

Always use UUIDs for GRUB booting in VMs instead of hardcoding values

Only necessary for wheezy and older Debian releases, since jessie
it's working fine ootb.
---

diff --git a/grml-debootstrap b/grml-debootstrap
index b967baa..3658d05 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1089,18 +1089,16 @@ finalize_vm() {
   fi
   chroot "${MNTPOINT}" update-grub
 
+  case "$RELEASE" in
+    lenny|squeeze|wheezy)
+      einfo "Adjusting grub.cfg for successful boot sequence."
+      sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg
+      ;;
+  esac
+
   umount "${MNTPOINT}"/proc
   umount "${MNTPOINT}"/sys
   umount "${MNTPOINT}"/dev
-
-  einfo "Adjusting grub.cfg for successful boot sequence."
-  if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ]; then
-    sed -i "s;root=[^ ]\+;root=UUID=$DISK_IDENTIFIER;" /boot/grub/grub.cfg
-  else
-    sed -i "s;set root=.*;set root='(hd0,msdos1)';" "${MNTPOINT}"/boot/grub/grub.cfg
-    sed -i "s;root=[^ ]\+;root=/dev/sda1;" "${MNTPOINT}"/boot/grub/grub.cfg
-  fi
-
   umount "${MNTPOINT}"
   kpartx -d "${ORIG_TARGET}" >/dev/null
 }