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

[Michael Tautschnig]

Author: mt
Date: 2010-11-27 09:35:33 +0000 (Sat, 27 Nov 2010)
New Revision: 6202

Modified:
   branches/experimental/patches/grub-pc
   branches/experimental/patches/logtail
Log:
updated experimental patches to match current trunk


Modified: branches/experimental/patches/grub-pc
===================================================================
--- branches/experimental/patches/grub-pc	2010-11-25 16:45:58 UTC (rev 6201)
+++ branches/experimental/patches/grub-pc	2010-11-27 09:35:33 UTC (rev 6202)
@@ -41,13 +41,15 @@
 ===================================================================
 --- trunk.orig/examples/simple/scripts/GRUB_PC/10-setup
 +++ trunk/examples/simple/scripts/GRUB_PC/10-setup	
-@@ -2,8 +2,20 @@
+@@ -3,10 +3,21 @@
  
  error=0 ; trap "error=$((error|1))" ERR
  
 -$ROOTCMD grub-mkdevicemap -n -m /boot/grub/device.map
 -$ROOTCMD grub-mkconfig -o /boot/grub/grub.cfg
--$ROOTCMD grub-install --no-floppy "(hd0)"
+-GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
+-$ROOTCMD grub-install --no-floppy "$GROOT"
+-echo "Grub installed on $BOOT_DEVICE = $GROOT"
 +set -a
 +
 +# during softupdate use this file
@@ -58,13 +60,14 @@
 +$ROOTCMD grub-mkdevicemap --no-floppy
 +
 +for device in $BOOT_DEVICE; do
-+  $ROOTCMD /usr/sbin/grub-install --no-floppy --modules="lvm raid" "$device"
++  GROOT=$($ROOTCMD grub-probe -tdrive -d $device)
++  $ROOTCMD grub-install --no-floppy --modules="lvm raid" "$GROOT"
++  echo "Grub installed on $device = $GROOT"
 +done
 +
 +$ROOTCMD update-grub
  
  exit $error
-+
 Index: trunk/examples/simple/class/50-host-classes
 ===================================================================
 --- trunk.orig/examples/simple/class/50-host-classes

Modified: branches/experimental/patches/logtail
===================================================================
--- branches/experimental/patches/logtail	2010-11-25 16:45:58 UTC (rev 6201)
+++ branches/experimental/patches/logtail	2010-11-27 09:35:33 UTC (rev 6202)
@@ -6,7 +6,7 @@
 ===================================================================
 --- trunk.orig/bin/fai
 +++ trunk/bin/fai	
-@@ -290,6 +290,9 @@
+@@ -291,6 +291,9 @@
      mkdir -p $LOGDIR
      ln -snf $action-$fai_rundate $LOGDIR/../last-$action
      ln -snf $action-$fai_rundate $LOGDIR/../last