diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2013-09-10 21:27:55 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-10 22:58:29 +0100 |
| commit | 2df21a3b27543df912a3ce05bef2415fae13cb7c (patch) | |
| tree | caa16e24f1fbb2ed58fd2c450ead6eff3af1b734 | |
| parent | 787335494dc0a3f93d9bf5a6cf1b603c8675df66 (diff) | |
| download | openembedded-core-2df21a3b27543df912a3ce05bef2415fae13cb7c.tar.gz openembedded-core-2df21a3b27543df912a3ce05bef2415fae13cb7c.tar.bz2 openembedded-core-2df21a3b27543df912a3ce05bef2415fae13cb7c.zip | |
mount.sh: automount cdrom device even if no ID_FS_TYPE available
This script was modified to check whether $ID_FS_TYPE is empty before
automount, however, for cdrom devices on qemu, the ID_FS_TYPE is not
set, yet the device should be mounted. Otherwise, when booting an iso
image with runqemu, the boot process hangs at 'waiting for removable
media'.
This patch fixes this problem by first checking whether the block device
is a cdrom.
[YOCTO #4487]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/udev/udev-extraconf/mount.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index 327cfc6477..cb57e47a90 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh @@ -58,7 +58,11 @@ rm_dir() { fi } -if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" ]; then +# No ID_FS_TYPE for cdrom device, yet it should be mounted +name="`basename "$DEVNAME"`" +[ -e /sys/block/$name/device/media ] && media_type=`cat /sys/block/$name/device/media` + +if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_type" = "cdrom" ]; then if [ -x "$PMOUNT" ]; then $PMOUNT $DEVNAME 2> /dev/null elif [ -x $MOUNT ]; then |