[Fai-commit] r6242 - trunk/examples/simple/scripts/GRUB_PC

[Michael Tautschnig]

Author: mt
Date: 2010-12-17 14:14:27 +0000 (Fri, 17 Dec 2010)
New Revision: 6242

Modified:
   trunk/examples/simple/scripts/GRUB_PC/10-setup
Log:
simple/scripts/GRUB_PC/10-setup: No need to deal with multiple devices anymore,
BOOT_DEVICE will always a be single value. 

This version of 10-setup is known to work both with lenny and squeeze.

Thanks: alekibango, David Dreezer


Modified: trunk/examples/simple/scripts/GRUB_PC/10-setup
===================================================================
--- trunk/examples/simple/scripts/GRUB_PC/10-setup	2010-12-17 14:13:34 UTC (rev 6241)
+++ trunk/examples/simple/scripts/GRUB_PC/10-setup	2010-12-17 14:14:27 UTC (rev 6242)
@@ -11,13 +11,14 @@
 [ -z "$BOOT_DEVICE" ]    && exit 701
 
 $ROOTCMD grub-mkdevicemap --no-floppy
+GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
+# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606035
+GROOT=$(echo $GROOT | sed 's:md/:md:g')
 
-for device in $BOOT_DEVICE; do
-  GROOT=$($ROOTCMD grub-probe -tdrive -d $device)
-  $ROOTCMD grub-install --no-floppy --modules="lvm raid" "$GROOT"
-  echo "Grub installed on $device = $GROOT"
-done
+$ROOTCMD grub-install --no-floppy "$GROOT"
+echo "Grub installed on $BOOT_DEVICE = $GROOT"
 
 $ROOTCMD update-grub
 
+
 exit $error