From: Denys Dmytriyenko <[email protected]> This is done to work around the issue of auto-mounting block devices (i.e. SD cards) when root filesystem is still in read-only mode and creating /media/<device> is not possible. That is due to udev getting started earlier (/etc/rcS.d/S03udev) than checkroot gets a chance to re-mount the rootfs as read-write (/etc/rcS.d/S10checkroot.sh).
Although, canonical FHS specifies /media/<device> as a mount point for removable media devices, the latest 2.3 version was released in 2004 and since then FreeDesktop/udisks and other tools adopted the new /run/media/<user>/<device> location. That was done to overcome read-only rootfs limitation and avoid name-clash between users. For our embedded systems environment we assume single-user operation and hence simplify mount point to just /run/media/<device>. Signed-off-by: Denys Dmytriyenko <[email protected]> Cc: Tom Rini <[email protected]> Cc: Franklin S. Cooper Jr <[email protected]> --- v2 - fix typo in FreeDesktop and Cc Tom and Franklin meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh | 12 ++++++------ .../recipes-core/udev/udev-extraconf_1.0.bbappend | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh b/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh index d1419ed..0f436ca 100644 --- a/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh @@ -20,19 +20,19 @@ done automount() { name="`basename "$DEVNAME"`" - ! test -d "/media/$name" && mkdir -p "/media/$name" + ! test -d "/run/media/$name" && mkdir -p "/run/media/$name" # Silent util-linux's version of mounting auto if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ; then MOUNT="$MOUNT -o silent" fi - if ! $MOUNT -t auto $DEVNAME "/media/$name" + if ! $MOUNT -t auto $DEVNAME "/run/media/$name" then - #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" - rm_dir "/media/$name" + #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/run/media/$name\" failed!" + rm_dir "/run/media/$name" else - logger "mount.sh/automount" "Auto-mount of [/media/$name] successful" + logger "mount.sh/automount" "Auto-mount of [/run/media/$name] successful" touch "/tmp/.automount-$name" fi } @@ -72,5 +72,5 @@ if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then # Remove empty directories from auto-mounter name="`basename "$DEVNAME"`" - test -e "/tmp/.automount-$name" && rm_dir "/media/$name" + test -e "/tmp/.automount-$name" && rm_dir "/run/media/$name" fi diff --git a/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bbappend b/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bbappend index c0ab069..997adf2 100644 --- a/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bbappend +++ b/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bbappend @@ -1,4 +1,4 @@ # look for files in this layer first FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PR_append = "-arago0" +PR_append = "-arago1" -- 1.8.3.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
