[Fai-commit] r5539 - trunk/examples/simple/files/boot/grub/menu.lst

[Michael Tautschnig]

Author: mt
Date: 2009-10-16 12:07:37 +0000 (Fri, 16 Oct 2009)
New Revision: 5539

Modified:
   trunk/examples/simple/files/boot/grub/menu.lst/postinst
Log:
Completing the simple-example-is-softupdate-compatible-patch, part 2

The use of $LOGDIR should be safe in here (I'm doing it myself this way for
quite some time now), but just in case we missed something, this change is kept
in a separate commit



Modified: trunk/examples/simple/files/boot/grub/menu.lst/postinst
===================================================================
--- trunk/examples/simple/files/boot/grub/menu.lst/postinst	2009-10-16 12:05:37 UTC (rev 5538)
+++ trunk/examples/simple/files/boot/grub/menu.lst/postinst	2009-10-16 12:07:37 UTC (rev 5539)
@@ -4,8 +4,12 @@
 
 set -a
 
-# during softupdate use this file
-[ -r $target/var/log/fai/disk_var.sh ] && . $target/var/log/fai/disk_var.sh
+if [ -r $LOGDIR/disk_var.sh ] ; then
+  . $LOGDIR/disk_var.sh
+else
+  echo "disk_var.sh not found!"
+  exit 0
+fi
 
 # if class NOMBR is defined, write boot loader into root partition, not into mbr
 ifclass NOMBR && BOOT_DEVICE=$BOOT_PARTITION