[Fai-commit] r5620 - in trunk: debian examples/simple/files/etc/fai/menu.lst

[Thomas Lange]

Author: lange
Date: 2009-10-29 15:23:13 +0000 (Thu, 29 Oct 2009)
New Revision: 5620

Modified:
   trunk/debian/changelog
   trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER
Log:
fix class FAISERVER (closes: #517517)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-29 13:33:43 UTC (rev 5619)
+++ trunk/debian/changelog	2009-10-29 15:23:13 UTC (rev 5620)
@@ -1,4 +1,4 @@
-fai (3.2.23~beta33) unstable; urgency=low
+fai (3.2.23~beta34) unstable; urgency=low
 
   [ Thomas Lange ]
   * NEWS: add hint about missing packages in nfsroot, changes in
@@ -120,7 +120,7 @@
   * examples/simple/files/etc/fai/*: update to more recent config files
   * Makefile: remove .svn directories in fai-doc
   * debian/source/format: use source package format 3.0 (native)
-  * fix class FAISERVER
+  * fix class FAISERVER (closes: #517517)
   * set default values using bash : ${variable:=value}
   
   [ Michael Tautschnig ]
@@ -163,7 +163,7 @@
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed
  
- -- Thomas Lange <lange at debian.org>  Wed, 28 Oct 2009 11:42:44 +0100
+ -- Thomas Lange <lange at debian.org>  Thu, 29 Oct 2009 16:23:01 +0100
 
 fai (3.2.20) unstable; urgency=low
 

Modified: trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER
===================================================================
--- trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER	2009-10-29 13:33:43 UTC (rev 5619)
+++ trunk/examples/simple/files/etc/fai/menu.lst/FAISERVER	2009-10-29 15:23:13 UTC (rev 5620)
@@ -1,17 +1,16 @@
 # grub menu.lst for fai-cd
 
 # Boot automatically after some secs.
-# timeout 15
+timeout 30
 
 color light-gray/black light-gray/red
 default 6
 
 title |
 root (cd)
-title |
 title +------------------------------------------------------+
 root (cd)
-title |    FAI-CD (c) 2005, Thomas Lange, lange at debian.org   |
+title |    FAI-CD        (c) Thomas Lange, lange at debian.org  |
 root (cd)
 title | _VERSIONSTRING_ |
 root (cd)
@@ -21,30 +20,25 @@
 root (cd)
 title |
 
+title boot from local disk
+rootnoverify (hd0)
+chainloader +1
+
 title Fully Automatic Installation - demohost (pw: installme)
 password installme
-#root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,createvt,syslogd" FAI_ACTION=install ip=192.168.1.250::::faiserver::off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
 initrd /boot/initrd.img
 
 title Fully Automatic Installation with GNOME (pw: installme)
 password installme
-root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,createvt,syslogd" FAI_ACTION=install ip=192.168.1.1::::gnomehost::off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
 initrd /boot/initrd.img
 
 title Fully Automatic Installation - faiserver (pw: installme)
 password installme
-#root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,createvt,syslogd" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0:faiserver::off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0::xxx:off hostname=faiserver
 initrd /boot/initrd.img
 
 title FAI rescue system, no installation
-root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,syslogd,createvt" FAI_ACTION=sysinfo ip=192.168.1.1::::demohost::off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
 initrd /boot/initrd.img
-
-#title Boot vmlinuz from hda1
-#root (hd0,0)
-#kernel /vmlinuz root=/dev/hda1
-#initrd /initrd.img