diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-05-15 15:04:59 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-20 14:53:12 +0100 |
commit | 1899511918cb08698377ffe09a021fc234ddaf98 (patch) | |
tree | b24fb4c78ee2d08418bce56976a870f46ae427ab /meta/recipes-core/udev | |
parent | 438b8661ad3487bd4edca546b1d2deb15360db14 (diff) | |
download | poky-1899511918cb08698377ffe09a021fc234ddaf98.tar.gz |
udev-extraconf: fix the misuse of /run/media
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.
(From OE-Core rev: 62ae16c40252f39ba28e072218d67f47b26b3535)
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>
Diffstat (limited to 'meta/recipes-core/udev')
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf/mount.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index 3e4f21f2eb..7df1b6e3e7 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh | |||
@@ -60,7 +60,7 @@ rm_dir() { | |||
60 | 60 | ||
61 | # No ID_FS_TYPE for cdrom device, yet it should be mounted | 61 | # No ID_FS_TYPE for cdrom device, yet it should be mounted |
62 | name="`basename "$DEVNAME"`" | 62 | name="`basename "$DEVNAME"`" |
63 | [ -e /sys/block/$name/device/run/media ] && media_type=`cat /sys/block/$name/device/run/media` | 63 | [ -e /sys/block/$name/device/media ] && media_type=`cat /sys/block/$name/device/media` |
64 | 64 | ||
65 | if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_type" = "cdrom" ]; then | 65 | if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_type" = "cdrom" ]; then |
66 | if [ -x "$PMOUNT" ]; then | 66 | if [ -x "$PMOUNT" ]; then |