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

Michael Tautschnig mt at alioth.debian.org
Tue Oct 19 09:59:16 UTC 2010


Author: mt
Date: 2010-10-19 09:59:13 +0000 (Tue, 19 Oct 2010)
New Revision: 6166

Modified:
   branches/experimental/patches/grub-pc
Log:
Removed translation to grub device names as it shouldn't be necessary, according
to the grub-install man page (thanks andrew bezella for pointing this out)


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-10-17 08:26:57 UTC (rev 6165)
+++ branches/experimental/patches/grub-pc	2010-10-19 09:59:13 UTC (rev 6166)
@@ -41,7 +41,7 @@
 ===================================================================
 --- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
 +++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
-@@ -2,8 +2,25 @@
+@@ -2,8 +2,20 @@
  
  error=0 ; trap "error=$((error|1))" ERR
  
@@ -58,12 +58,7 @@
 +$ROOTCMD grub-mkdevicemap --no-floppy
 +
 +for device in $BOOT_DEVICE; do
-+  grub_dev=$(device2grub $device)
-+  if [ -z "$grub_dev" ] ; then
-+    grub_dev=$(echo $device | sed 's#^/dev/##')
-+    grub_dev="($grub_dev)"
-+  fi
-+  $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="lvm raid" "$grub_dev"
++  $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="lvm raid" "$device"
 +done
 +
 +$ROOTCMD update-grub




More information about the Fai-commit mailing list