# 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
# 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"