[Fai-commit] r6495 - trunk/conf

[Thomas Lange]

Author: lange
Date: 2011-04-19 11:55:21 +0000 (Tue, 19 Apr 2011)
New Revision: 6495

Modified:
   trunk/conf/grub.cfg
   trunk/conf/menu.lst
Log:
do not use ip= kernel parameter, dhcp is now the default

Currently live-boot does not use the same syntax as the kernel ip= parameter.


Modified: trunk/conf/grub.cfg
===================================================================
--- trunk/conf/grub.cfg	2011-04-18 23:22:58 UTC (rev 6494)
+++ trunk/conf/grub.cfg	2011-04-19 11:55:21 UTC (rev 6495)
@@ -51,31 +51,31 @@
 
 menuentry "Fully Automatic Installation - demohost (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
-    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=demohost
+    linux   /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=demohost
     initrd  /boot/initrd.img
 }
 
 menuentry "Fully Automatic Installation with XFCE (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
-    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=xfcehost
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=xfcehost
     initrd /boot/initrd.img
 }
 
 menuentry "Fully Automatic Installation with GNOME (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
-    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.1.1:::::eth0:off hostname=gnomehost
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gnomehost
     initrd /boot/initrd.img
 }
 
 menuentry "Fully Automatic Installation - faiserver (user: grub pw: installme)" --users "grub" {
     set gfxpayload=1024x768
-    linux /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
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=faiserver
     initrd /boot/initrd.img
 }
 
 menuentry "FAI rescue system, no installation" {
     set gfxpayload=1024x768
-    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.1.1:::::eth0:off hostname=demohost
+    linux /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
     initrd /boot/initrd.img
 }
 

Modified: trunk/conf/menu.lst
===================================================================
--- trunk/conf/menu.lst	2011-04-18 23:22:58 UTC (rev 6494)
+++ trunk/conf/menu.lst	2011-04-19 11:55:21 UTC (rev 6495)
@@ -26,19 +26,19 @@
 
 title Fully Automatic Installation - demohost (pw: installme)
 password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=demohost
 initrd /boot/initrd.img
 
 title Fully Automatic Installation with GNOME (pw: installme)
 password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.1:::::eth0:off hostname=gnomehost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=gnomehost
 initrd /boot/initrd.img
 
 title Fully Automatic Installation - faiserver (pw: installme)
 password installme
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install ip=192.168.33.250::192.168.33.254:255.255.255.0::xxx:off hostname=faiserver
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=install hostname=faiserver
 initrd /boot/initrd.img
 
 title FAI rescue system, no installation
-kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo ip=192.168.33.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
 initrd /boot/initrd.img