]> code.ossystems Code Review - openembedded-core.git/commitdiff
udev-extraconf: fix the misuse of /run/media
authorChen Qi <Qi.Chen@windriver.com>
Thu, 15 May 2014 07:04:59 +0000 (15:04 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 20 May 2014 13:52:21 +0000 (14:52 +0100)
The error was introduced by the following commit.

  acfe3014d41de5e87cdbc58d0396349c6b9c3ffd
  udev-extraconf: update mount.sh to use /run/media instead of /media

It accidently replaced 'device/media' by 'device/run/media' which causes
error for live images to be unable to boot up correctly, complaining
"Cannot find rootfs.img in /media/*".

This patch fixes the above problem.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/udev/udev-extraconf/mount.sh

index 3e4f21f2eb20760034bbbb1b41ff0fc41c5c522d..7df1b6e3e7882de6ba5045a3c1e49f6ba16e7037 100644 (file)
@@ -60,7 +60,7 @@ rm_dir() {
 
 # No ID_FS_TYPE for cdrom device, yet it should be mounted
 name="`basename "$DEVNAME"`"
-[ -e /sys/block/$name/device/run/media ] && media_type=`cat /sys/block/$name/device/run/media`
+[ -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