From: Michael Prokop <mika@grml.org>
Date: Mon, 14 Jan 2008 19:33:50 +0000 (+0100)
Subject: Fix the grml 1.1-rc1 does not open the CD-ROM tray on reboot/halt issue
X-Git-Tag: 1.1.1
X-Git-Url: http://git.grml.org/?p=grml-etc.git;a=commitdiff_plain;h=b191aece5fe495440112226c812d92009a23b464

Fix the grml 1.1-rc1 does not open the CD-ROM tray on reboot/halt issue
---

diff --git a/debian/changelog b/debian/changelog
index 4dc5afb..27fb51a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-etc (1.1.1) unstable; urgency=low
+
+  * Fix the "grml 1.1-rc1 does not open the CD-ROM tray on reboot/halt"
+    issue. Thanks to Josef Teske and several other bugreporters for
+    reporting this issue. [Closes: issue370]
+
+ -- Michael Prokop <mika@grml.org>  Mon, 14 Jan 2008 20:31:38 +0100
+
 grml-etc (1.1.0) unstable; urgency=low
 
   * A new stable release is coming. :)
diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index a7995b3..846184c 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: Fre Nov 16 11:37:58 CET 2007 [mika]
+# Latest change: Mon Jän 14 12:53:18 CET 2008 [mika]
 ################################################################################
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@ -148,7 +148,12 @@ fi
 
 # Detected cdrom device
 if [ -z "$INSTALLED" ]; then
-   CDROM="$(awk '/ \/cdrom /{print $1;exit 0;}' /proc/mounts)"
+   # new live-initramfs layout:
+   if [ -d /live/image ] ; then
+      CDROM="$(awk '/ \/live\/image /{print $1;exit 0;}' /proc/mounts)"
+   else # old unionfs layout:
+      CDROM="$(awk '/ \/cdrom /{print $1;exit 0;}' /proc/mounts)"
+   fi
 fi
 
 # Umount everything but root