iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv6 allow firewall
[automated-distro-installer]
/
grub.cfg.autodiscover
diff --git
a/grub.cfg.autodiscover
b/grub.cfg.autodiscover
index 1e7ce439d3ffe1f2bd578b26596620c5716bf233..6ed3a287a27078266bc0ae4c80fbf51b8facd898 100644
(file)
--- a/
grub.cfg.autodiscover
+++ b/
grub.cfg.autodiscover
@@
-55,12
+55,6
@@
menuentry "" --unrestricted {
set gfxpayload=$resolution
}
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
# 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
@@
-71,6
+65,13
@@
menuentry "FAI server via dns" {
}
}
+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
+}
+
+
menuentry "Boot OS of first partition on first disk" --unrestricted {
if [ -d (cd) ]; then
chainloader (hd0)+1
menuentry "Boot OS of first partition on first disk" --unrestricted {
if [ -d (cd) ]; then
chainloader (hd0)+1