/etc/init.d/grml-reboot: check for nfsroot

diff --git a/debian/changelog b/debian/changelog
index c864e1a..e5d59d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-etc (1.1.4) unstable; urgency=low
+
+  * /etc/init.d/grml-reboot: check for nfsroot (and keep check
+    for nfsdir as well to avoid breaking any existing scripts).
+    Thanks for reporting to Wolfgang Karall and thanks for the
+    test case to Jimmy.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 20 May 2008 01:28:51 +0200
+
 grml-etc (1.1.3) unstable; urgency=low
 
   * /etc/init.d/grml-reboot: put reboot + halt binaries to

diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index 0cf65d2..8cf0bb1 100755 (executable)
--- a/etc/init.d/grml-reboot
+++ b/etc/init.d/grml-reboot
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Mär 10 19:04:15 CET 2008 [mika]
+# Latest change: Tue May 20 01:28:38 CEST 2008 [mika]
 ################################################################################
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -26,7 +26,7 @@ grep -qe ' toram' -qe ' usb' -qe 'serial' -qe 'fromhd' /proc/cmdline && INSTALLE
 
 # check for boot via NFS:
 NFSBOOT=''
-if grep -q nfsdir /proc/cmdline ; then
+if grep -qe nfsroot -qe nfsdir /proc/cmdline ; then
    NFSBOOT=1
 fi