Boot terminalnodes with nodhcp again (thx ch for reporting)

diff --git a/debian/changelog b/debian/changelog
index 53ac696..0e5fe3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-terminalserver (0.95) unstable; urgency=low
+
+  * Boot terminalnodes with nodhcp again (thx ch for reporting). 
+
+ -- Michael Gebetsroither <gebi@grml.org>  Tue, 22 Jan 2008 17:51:55 +0100
+
 grml-terminalserver (0.94) unstable; urgency=low
 
   * create-netboot: fix wrong paths of tar.bz2, include version number

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index fb35176..b82dab4 100644 (file)
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -21,7 +21,7 @@
 # default boot arguments used for both grub and pxelinux
 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"
+boot=live lang=us nomce quiet apm=power-off nodhcp noeject"
 else
     default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
 init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \