From: Michael Prokop <mika@grml.org>
Date: Fri, 16 Nov 2007 10:41:34 +0000 (+0100)
Subject: /etc/init.d/grml-reboot: adjust for new live-initramfs layout
X-Git-Tag: 1.0.24
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=refs%2Ftags%2F1.0.24;p=grml-etc.git

/etc/init.d/grml-reboot: adjust for new live-initramfs layout
---

diff --git a/debian/changelog b/debian/changelog
index 3261945..c0d96cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-etc (1.0.24) unstable; urgency=low
+
+  * /etc/init.d/grml-reboot: adjust for new live-initramfs layout.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 16 Nov 2007 11:38:03 +0100
+
 grml-etc (1.0.23) unstable; urgency=low
 
   [ Michael Gebetsroither ]
diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index ebc9173..a7995b3 100755
--- 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: Die Jun 26 00:08:30 CEST 2007 [mika]
+# Latest change: Fre Nov 16 11:37:58 CET 2007 [mika]
 ################################################################################
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -19,7 +19,7 @@ exec >/dev/console 2>&1 </dev/console
 
 # Check if we are running from a GRML-CD or HD
 INSTALLED=""
-[ -e /GRML/etc/grml_cd ] || INSTALLED=yes
+[ -e /etc/grml_cd ] || INSTALLED=yes
 # Assume that we don't want the eject+prompt stuff when running in one
 # of the special modes:
 grep -qe ' toram' -qe ' usb' -qe 'serial' -qe 'fromhd' /proc/cmdline && INSTALLED=yes
@@ -175,10 +175,11 @@ log_end_msg 0
 
 if [ -z "$INSTALLED" -a -z "$NOPROMPT" ]; then
    # do not prompt for removal when running in grml2ram mode:
-   if ! mount | grep -q 'on /cdrom ' ; then
+   if ! mount | grep -qe 'on /cdrom' -qe 'on /live/image' ; then
       echo "CD not mounted, nothing to eject therefore."
    else
-      umount -l /cdrom
+      [ -d /live/image ] && umount -l /live/image
+      [ -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