X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=grub.cfg.autodiscover;h=6ed3a287a27078266bc0ae4c80fbf51b8facd898;hb=8bf6d9c4cc9ec88976c62af33f32c0c660e977e0;hp=b1516bb27446b76d775eb8c869b79d9469728065;hpb=527f50b38e4a94a771215131cafe016a97ba83cd;p=automated-distro-installer

diff --git a/grub.cfg.autodiscover b/grub.cfg.autodiscover
index b1516bb..6ed3a28 100644
--- a/grub.cfg.autodiscover
+++ b/grub.cfg.autodiscover
@@ -55,18 +55,19 @@ menuentry "" --unrestricted {
     set gfxpayload=$resolution
 }
 
-menuentry "Autodiscover the FAI server" {
-    set gfxpayload=$resolution
-    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
-    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" {
     set gfxpayload=$resolution
-    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 rootovl ip=dhcp FAI_FLAGS=verbose,sshd,createvt,reboot
+    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
+    initrd  /boot/initrd.img
+}
+
+
+menuentry "Autodiscover the FAI server" {
+    set gfxpayload=$resolution
+    linux   /boot/vmlinuz FAI_FLAGS="menu,verbose,createvt" fai.discover aufs rootovl root=/dev/nfs ip=dhcp quiet
     initrd  /boot/initrd.img
 }