projects
/
grml-etc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the grml 1.1-rc1 does not open the CD-ROM tray on reboot/halt issue
[grml-etc.git]
/
etc
/
init.d
/
grml-reboot
diff --git
a/etc/init.d/grml-reboot
b/etc/init.d/grml-reboot
index
a7995b3
..
846184c
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.
# 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
################################################################################
export PATH=/sbin:/bin:/usr/bin:/usr/sbin
@@
-148,7
+148,12
@@
fi
# Detected cdrom device
if [ -z "$INSTALLED" ]; then
# 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
fi
# Umount everything but root