X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Finit.d%2Fgrml-reboot;h=5564504b864b56ab16f9be0b1b3f92c808fc9e8b;hb=7a8acd5cb4cc3637cd18af83ce47418634c0fb0b;hp=0cf65d2939e0dbb852b55f3adb2bed4d38013317;hpb=520a0f1a4b4cfcbb2091de46c19a5ab0ba0a54ed;p=grml-etc.git

diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index 0cf65d2..5564504 100755
--- a/etc/init.d/grml-reboot
+++ b/etc/init.d/grml-reboot
@@ -4,7 +4,6 @@
 # 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]
 ################################################################################
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -26,7 +25,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
 
@@ -131,12 +130,6 @@ log_begin_msg "Deactivating udev:"
 echo -n "   ${GREEN}-${NORMAL} "
 /etc/init.d/udev stop ; log_end_msg $?
 
-if [ -z "$INSTALLED" ] ; then
-   mkdir -p /dev/pts
-   cp -a /GRML/dev/console /GRML/dev/tty[0-9]* /GRML/dev/loop* /GRML/dev/initctl /GRML/dev/null /dev/
-   ln -s /GRML/dev/* /dev/ 2>/dev/null
-fi
-
 # Read in boot parameters
 CMDLINE="$(cat /proc/cmdline 2>/dev/null)"
 # noprompt or noeject option given?
@@ -204,7 +197,7 @@ if [ -z "$INSTALLED" -a -z "$NOPROMPT" ]; then
       [ -d /cdrom ] && umount -l /cdrom
       [ -n "$CDROM" -a -z "$NOEJECT" ] && eject -p "$CDROM" 2>/dev/null
       echo
-      read -s -p "${GREEN}Please remove CD, close cdrom drive and hit return [auto 2 minutes].${NORMAL}" -t 120 a
+      read -s -p "${GREEN}Please remove the disc, close the tray (if any) and press ENTER to continue [auto 2 minutes].${NORMAL}" -t 120 a
    fi
 fi