[Fai-commit] r6529 - in branches/stable/3.4: conf examples/simple/files/etc/fai/menu.lst

Michael Prokop mika at alioth.debian.org
Tue May 10 10:00:42 UTC 2011 

Author: mika
Date: 2011-05-10 10:00:27 +0000 (Tue, 10 May 2011)
New Revision: 6529

Modified:
   branches/stable/3.4/conf/grub.cfg
   branches/stable/3.4/conf/menu.lst
   branches/stable/3.4/conf/menu.lst.boot-only
   branches/stable/3.4/examples/simple/files/etc/fai/menu.lst/FAISERVER
Log:
grub config: drop ip= configuration, to avoid conflicts between different implementations of live-* and kernel.

From: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/conf/grub.cfg
===================================================================
--- branches/stable/3.4/conf/grub.cfg	2011-05-09 16:30:00 UTC (rev 6528)
+++ branches/stable/3.4/conf/grub.cfg	2011-05-10 10:00:27 UTC (rev 6529)
@@ -48,25 +48,25 @@
 
 menuentry "Fully Automatic Installation - demohost (pw: installme)" {
     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 GNOME (pw: installme)" {
     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 (pw: installme)" {
     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: branches/stable/3.4/conf/menu.lst
===================================================================
--- branches/stable/3.4/conf/menu.lst	2011-05-09 16:30:00 UTC (rev 6528)
+++ branches/stable/3.4/conf/menu.lst	2011-05-10 10:00:27 UTC (rev 6529)
@@ -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.1.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.1.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.1.250::192.168.1.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.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
 initrd /boot/initrd.img

Modified: branches/stable/3.4/conf/menu.lst.boot-only
===================================================================
--- branches/stable/3.4/conf/menu.lst.boot-only	2011-05-09 16:30:00 UTC (rev 6528)
+++ branches/stable/3.4/conf/menu.lst.boot-only	2011-05-10 10:00:27 UTC (rev 6529)
@@ -25,9 +25,9 @@
 chainloader +1
 
 title Fully Automatic Installation
-kernel /boot/vmlinuz ip=dhcp root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=install
+kernel /boot/vmlinuz root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=install
 initrd /boot/initrd.img
 
 title FAI rescue system, no installation
-kernel /boot/vmlinuz ip=dhcp root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=sysinfo
+kernel /boot/vmlinuz root=/dev/nfs _NFSROOT_ boot=live FAI_FLAGS="verbose,sshd,createvt" FAI_ACTION=sysinfo
 initrd /boot/initrd.img

Modified: branches/stable/3.4/examples/simple/files/etc/fai/menu.lst/FAISERVER
===================================================================
--- branches/stable/3.4/examples/simple/files/etc/fai/menu.lst/FAISERVER	2011-05-09 16:30:00 UTC (rev 6528)
+++ branches/stable/3.4/examples/simple/files/etc/fai/menu.lst/FAISERVER	2011-05-10 10:00:27 UTC (rev 6529)
@@ -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.1.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.1.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.1.250::192.168.1.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.1.1:::::eth0:off hostname=demohost
+kernel /boot/vmlinuz boot=live FAI_FLAGS="verbose,createvt" FAI_ACTION=sysinfo hostname=demohost
 initrd /boot/initrd.img

More information about the Fai-commit mailing list