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

[Michael Tautschnig]

Author: mt
Date: 2010-04-28 12:26:29 +0000 (Wed, 28 Apr 2010)
New Revision: 5778

Modified:
   branches/experimental/patches/grub-pc
Log:
further cleanup of grub script


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-04-28 12:15:46 UTC (rev 5777)
+++ branches/experimental/patches/grub-pc	2010-04-28 12:26:29 UTC (rev 5778)
@@ -41,7 +41,7 @@
 ===================================================================
 --- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
 +++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
-@@ -2,8 +2,26 @@
+@@ -2,8 +2,22 @@
  
  error=0 ; trap "error=$((error|1))" ERR
  
@@ -56,13 +56,9 @@
 +[ -z "$BOOT_DEVICE" ]    && exit 701
 +
 +for device in $BOOT_DEVICE; do
-+  if echo $device | grep -q "^/dev/mapper/" ; then
-+    grub_dev=$(echo $device | sed 's#^/dev/mapper/##')
-+  else
-+    grub_dev=$(device2grub $device)
-+    if [ -z "$grub_dev" ] ; then
-+      grub_dev=$(echo $device | sed 's#^/dev/##')
-+    fi
++  grub_dev=$(device2grub $device)
++  if [ -z "$grub_dev" ] ; then
++    grub_dev=$(echo $device | sed 's#^/dev/##')
 +  fi
 +  $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="biosdisk part_msdos ext2 lvm raid" "($grub_dev)"
 +done