merged git:quickfix

[grml-terminalserver.git] / templates / grub-pxelinux_config

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 3ecd48b..fb35176 100644 (file)
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -19,9 +19,14 @@
 
 
 # default boot arguments used for both grub and pxelinux
-default_boot_args_="ramdisk_size=16384 root=/dev/ram0 rw \
+if [ -e '/live/cow' ]; then
+    default_boot_args_="root=/dev/nfs rw nfsroot=$IP_:$MOUNT_POINT_ \
+boot=live lang=us nomce quiet apm=power-off"
+else
+    default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
 init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
-apm=power-off nomce"
+apm=power-off nomce lang=us"
+fi
 
 # special boot arguments required by grub
 grub_def_boot_args_="/linux26 $default_boot_args_"
@@ -119,7 +124,7 @@ KERNEL linux26
 APPEND $pxe_def_boot_args_ $no_fb_args_
 LABEL memtest
 KERNEL memtest
-APPEND initrd=
+APPEND fix
 
 EOT