From: Michael Prokop <mika@grml.org>
Date: Tue, 17 Mar 2009 09:14:34 +0000 (+0100)
Subject: Do not use UUID on SW-RAID
X-Git-Tag: v0.26~1
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=43e7572cd0ec1da913edff68368e8fbb7d36a65b

Do not use UUID on SW-RAID
---

diff --git a/chroot-script b/chroot-script
index c59f455..2b3e1ef 100755
--- a/chroot-script
+++ b/chroot-script
@@ -405,11 +405,20 @@ grub() {
      $UPDATEGRUB -y
      if [ -f /boot/grub/menu.lst ] ; then
         sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
-	if [ -n "$TARGET_UUID" ] ; then
-	   sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-	else
-	   sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
-	fi
+        case "$TARGET" in
+             # do NOT use uuid with SW-RAID
+             /dev/md*)
+               sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               ;;
+             *)
+               if [ -n "$TARGET_UUID" ] ; then
+                 sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               else
+                 sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst
+               fi
+               ;;
+        esac
+
         # not sure why savedefault does not work for me; any ideas?
         sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
         $UPDATEGRUB -y
diff --git a/debian/changelog b/debian/changelog
index 83900f0..94a2f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-debootstrap (0.26) unstable; urgency=low
+
+  * Do not use UUID on SW-RAID.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 17 Mar 2009 10:13:50 +0100
+
 grml-debootstrap (0.25) unstable; urgency=low
 
   * Use configuration $RELEASE as well as default in interactive