From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Jan 2008 20:24:43 +0000 (+0100)
Subject: Boot terminalnodes with noprompt
X-Git-Tag: 0.95~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=ab72ac2842252c14e8f597f2bf423411f66bf369

Boot terminalnodes with noprompt
---

diff --git a/debian/changelog b/debian/changelog
index 0e5fe3a..1d25115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 grml-terminalserver (0.95) unstable; urgency=low
 
-  * Boot terminalnodes with nodhcp again (thx ch for reporting). 
+  [ Michael Gebetsroither ]
+  * Boot terminalnodes with nodhcp again (thx ch for reporting).
+
+  [ Michael Prokop ]
+  * Boot terminalnodes with noprompt.
 
- -- Michael Gebetsroither <gebi@grml.org>  Tue, 22 Jan 2008 17:51:55 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 25 Jan 2008 21:24:28 +0100
 
 grml-terminalserver (0.94) unstable; urgency=low
 
diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index b82dab4..d224569 100644
--- 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 nodhcp noeject"
+boot=live lang=us nomce quiet apm=power-off nodhcp noprompt noeject"
 else
     default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
 init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \