[Fai-commit] r6475 - in trunk/examples/simple: class scripts/GRUB
Michael Tautschnig
mt at alioth.debian.org
Sat Apr 16 10:05:37 UTC 2011
Author: mt
Date: 2011-04-16 10:05:28 +0000 (Sat, 16 Apr 2011)
New Revision: 6475
Modified:
trunk/examples/simple/class/50-host-classes
trunk/examples/simple/scripts/GRUB/10-setup
trunk/examples/simple/scripts/GRUB/20-initramfs
Log:
simple examples: use GRUB_PC as default, add info header to GRUB and GRUB_PC scripts.
Merge of 03208d2 from 3.4 into trunk.
Modified: trunk/examples/simple/class/50-host-classes
===================================================================
--- trunk/examples/simple/class/50-host-classes 2011-04-16 10:03:23 UTC (rev 6474)
+++ trunk/examples/simple/class/50-host-classes 2011-04-16 10:05:28 UTC (rev 6475)
@@ -25,5 +25,5 @@
echo "FAIBASE DEBIAN DHCPC" ;;
esac
-(ifclass I386 || ifclass AMD64) && echo GRUB
+(ifclass I386 || ifclass AMD64) && echo GRUB_PC
exit 0
Modified: trunk/examples/simple/scripts/GRUB/10-setup
===================================================================
--- trunk/examples/simple/scripts/GRUB/10-setup 2011-04-16 10:03:23 UTC (rev 6474)
+++ trunk/examples/simple/scripts/GRUB/10-setup 2011-04-16 10:05:28 UTC (rev 6475)
@@ -1,4 +1,5 @@
#! /bin/bash
+# support for GRUB version 1 (0.97)
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
Modified: trunk/examples/simple/scripts/GRUB/20-initramfs
===================================================================
--- trunk/examples/simple/scripts/GRUB/20-initramfs 2011-04-16 10:03:23 UTC (rev 6474)
+++ trunk/examples/simple/scripts/GRUB/20-initramfs 2011-04-16 10:05:28 UTC (rev 6475)
@@ -1,4 +1,5 @@
#! /bin/bash
+# support for GRUB version 1 (0.97)
error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
More information about the Fai-commit
mailing list