[Fai-commit] r4316 - trunk/conf

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-12 14:55:34 +0000 (Tue, 12 Jun 2007)
New Revision: 4316

Modified:
   trunk/conf/menu.lst
Log:
remove unneeded options, add boot=live for new initrd


Modified: trunk/conf/menu.lst
===================================================================
--- trunk/conf/menu.lst	2007-06-12 14:53:37 UTC (rev 4315)
+++ trunk/conf/menu.lst	2007-06-12 14:55:34 UTC (rev 4316)
@@ -27,22 +27,22 @@
 title Fully Automatic Installation - demohost (pw: installme)
 password installme
 #root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1::::demohost:eth0:off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1::::demohost:eth0:off
 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" FAI_ACTION=install ip=192.168.1.1::::gnomehost:eth0:off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1::::gnomehost:eth0:off
 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" FAI_ACTION=install ip=192.168.1.250::192.168.1.254:255.255.255.0:faiserver:xxx: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:faiserver:xxx:off
 initrd /boot/initrd.img
 
 title FAI rescue system, no installation
 root (cd)
-kernel /boot/vmlinuz root=/dev/ram0 init=/linuxrc FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1::::demohost:eth0:off rw
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1::::demohost:eth0:off
 initrd /boot/initrd.img