bunch of minor updates

[automated-distro-installer] / grub.cfg.autodiscover

diff --git a/grub.cfg.autodiscover b/grub.cfg.autodiscover
index 1e7ce439d3ffe1f2bd578b26596620c5716bf233..8d102687c17d2b50e2a8d50e355a39115d26c4ae 100644 (file)
--- a/grub.cfg.autodiscover
+++ b/grub.cfg.autodiscover
@@ -55,18 +55,20 @@ menuentry "" --unrestricted {
     set gfxpayload=$resolution
 }
 
-menuentry "Autodiscover the FAI server" {
+# ian: Added this from fai
+# note, we could replace faiserver with an ip if we didn't want to mess with dns.
+# args are copied from myfai-chboot-local.
+# Note, for a real cd or usb flash, we probably do not want reboot, so we can remove the disk
+# after install is done
+menuentry "FAI server via dns" {
     set gfxpayload=$resolution
-    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
+    linux   /boot/vmlinuz FAI_FLAGS=verbose,sshd,createvt,reboot FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config root=/dev/nfs rw nfsroot=faiserver:/srv/fai/nfsroot,vers=3,nolock aufs rootvol ip=dhcp FAI_FLAGS=verbose,sshd,createvt
     initrd  /boot/initrd.img
 }
 
-# ian: Added this from fai
-# note, we could replace faiserver with an ip if we didn't want to mess with dns.
-# args are copied from myfai-chboot-local
-menuentry "FAI server via dns" {
+menuentry "Autodiscover the FAI server" {
     set gfxpayload=$resolution
-    linux   /boot/vmlinuz FAI_FLAGS=verbose,sshd,createvt FAI_CONFIG_SRC=nfs://faiserver/srv/fai/config root=/dev/nfs rw nfsroot=faiserver:/srv/fai/nfsroot,vers=3,nolock aufs rootovl ip=dhcp FAI_FLAGS=verbose,sshd,createvt
+    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt,reboot" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
     initrd  /boot/initrd.img
 }