From af8bb9527b0a69518f42279829c3053ecf408c60 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 30 Sep 2007 16:33:04 +0200 Subject: [PATCH] Apply patch by Moritz Augsburger for identifying /dev/cdrom --- debian/changelog | 3 ++- usr_sbin/grml2ram | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3dd887..66169ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ grml-scripts (1.0.19) unstable; urgency=low - * grml2ram: adjust for usage with new live-initramfs layout + * grml2ram: adjust for usage with new live-initramfs layout. + Apply patch by Moritz Augsburger for identifying /dev/cdrom. -- Michael Prokop Sun, 30 Sep 2007 16:04:31 +0200 diff --git a/usr_sbin/grml2ram b/usr_sbin/grml2ram index b0ba4e6..6665584 100755 --- a/usr_sbin/grml2ram +++ b/usr_sbin/grml2ram @@ -55,9 +55,16 @@ close LOOP; close DEST; EOF +# identify cd-rom: +GRMLDEV=$(awk '{if ($2 ~ /^\/live\/image$/ ) print $1}' /etc/mtab) +if [ -z "$GRMLDEV" ]; then + GRMLDEV=$(awk '{if ($2 ~ /^\/cdrom$/ ) print $1}' /etc/mtab) +fi +[ -n "$GRMLDEV" ] || GRMLDEV='/dev/cdrom' + einfo "Unmounting cdrom" [ -d /live/image ] && umount /live/image || umount /cdrom eend $? -einfo "Now you can eject your grml-cd (e.g. run 'eject /dev/cdrom')." ; eend 0 +einfo "Now you can eject your grml-cd (e.g. run 'eject $GRMLDEV')." ; eend 0 ## END OF FILE ################################################################# -- 2.1.4