X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Finit.d%2Fgrml-reboot;h=21ccf6c51c708cb82fce64f110523ec9a4222e09;hb=2839fd86b1c68c62e6bb2d9d9ed2164e4d82da73;hp=c90fa8c3aad689dd5aa299432a9abb9a9fdd2cac;hpb=899ef33564704d947c8c3abe95ec2455e1dcd43c;p=grml-etc.git

diff --git a/etc/init.d/grml-reboot b/etc/init.d/grml-reboot
index c90fa8c..21ccf6c 100755
--- a/etc/init.d/grml-reboot
+++ b/etc/init.d/grml-reboot
@@ -5,6 +5,13 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 ################################################################################
+### BEGIN INIT INFO
+# Provides:          grml-reboot
+# Required-Start:
+# Required-Stop:
+# Default-Start:
+# Default-Stop:
+### END INIT INFO
 
 export PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
@@ -36,13 +43,17 @@ grep -qe 'toram' -qe '2ram' -qe 'usb' -qe 'serial' \
 
 # detect cdrom device
 if ! $INSTALLED ; then
-   # new live-initramfs layout:
-   if [ -d /live/image ] ; then
-      CDROM="$(awk '/ \/live\/image /{print $1;exit 0;}' /proc/mounts)"
-      MOUNTPATH="/live/image"
-   else # old unionfs layout:
-      CDROM="$(awk '/ \/cdrom /{print $1;exit 0;}' /proc/mounts)"
-      MOUNTPATH="/cdrom"
+   # live-boot layout since December 2012:
+   if [ -d /lib/live/mount/medium ] ; then
+     CDROM="$(awk '/ \/lib\/live\/mount\/medium /{print $1;exit 0;}' /proc/mounts)"
+     MOUNTPATH="/lib/live/mount/medium"
+   # live-boot layout until December 2012:
+   elif [ -d /live/image ] ; then
+     CDROM="$(awk '/ \/live\/image /{print $1;exit 0;}' /proc/mounts)"
+     MOUNTPATH="/live/image"
+   else # old layout:
+     CDROM="$(awk '/ \/cdrom /{print $1;exit 0;}' /proc/mounts)"
+     MOUNTPATH="/cdrom"
    fi
 
    # try to remove only removable devices
@@ -149,7 +160,8 @@ esac
 [ -r /etc/noprompt ] && NOPROMPT=true
 [ -r /etc/noeject ]  && NOPROMPT=true && NOEJECT=true
 
-if [ "$(/usr/bin/imvirt 2>/dev/null)" != "Physical" ] ; then
+VIRT_WHAT=$(/usr/sbin/virt-what 2>/dev/null)
+if [ -n "$VIRT_WHAT" ] ; then
   log_begin_msg "System seems to be a virtual machine, assuming noprompt as default."
   NOPROMPT=true
   log_end_msg 0
@@ -202,7 +214,7 @@ $INSTALLED && mount -n -o remount,ro / 2>/dev/null
 # Prompt for removal of live system device
 if ! $INSTALLED && ! $NOPROMPT ; then
    # do not prompt for removal when running in grml2ram mode:
-   if ! mount | grep -qe 'on /cdrom' -qe 'on /live/image' ; then
+   if ! mount | grep -qe 'on /cdrom' -qe 'on /live/image' -qe 'on /lib/live/mount/medium' ; then
       echo "Live System not mounted, nothing to eject therefore."
    else
       [ -d "$MOUNTPATH" ] && umount -l "$MOUNTPATH"