[Fai-commit] r6237 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-12-16 19:35:21 +0000 (Thu, 16 Dec 2010)
New Revision: 6237

Modified:
   branches/experimental/patches/setup-storage_boot-device
Log:
A version of the 10-setup file for grub-pc that is known to work with software
RAID AND lenny and squeeze.

Thanks alekibango and David Dreezer for lots of testing and debugging.


Modified: branches/experimental/patches/setup-storage_boot-device
===================================================================
--- branches/experimental/patches/setup-storage_boot-device	2010-12-16 19:06:29 UTC (rev 6236)
+++ branches/experimental/patches/setup-storage_boot-device	2010-12-16 19:35:21 UTC (rev 6237)
@@ -228,18 +228,23 @@
 ===================================================================
 --- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
 +++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
-@@ -12,11 +12,9 @@
+@@ -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
-+GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
-+$ROOTCMD grub-install --no-floppy --modules="lvm raid" "$GROOT"
++$ROOTCMD grub-install --no-floppy "$GROOT"
 +echo "Grub installed on $BOOT_DEVICE = $GROOT"
  
  $ROOTCMD update-grub
  
++
+ exit $error