summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/udev
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2022-07-17 14:56:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-25 15:11:46 +0100
commit66f67f397e1b17529c5677128b9422d7f3228781 (patch)
tree17d08afd086cfc93ab30d75d0b3157f527ff5cdd /meta/recipes-core/udev
parent342745ce67dac1147a603dbd44251c9a0dd2bb90 (diff)
downloadpoky-66f67f397e1b17529c5677128b9422d7f3228781.tar.gz
udev-extraconf:mount.sh: fix path mismatching issues
Since commit f077befd5f36ad88623aaf6a38b1a837ecb18650: [ udev-extraconf: let automount base directory configurable ] the mount base directory was configurable, we need drop 'run-media' usage as well, change to figure it out from MOUNT_BASE. Also 'get_label_name' function needs to be called ealier in automount_systemd before checking '/tmp/.automount-$name', otherwise they would never match. (From OE-Core rev: c013b33162546fb5bd4bcc1daac75aa65d0be1a3) (From OE-Core rev: cb37eebf477e9907363b195c3d460b14717c5fea) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7ed210054b3e253d5a67075bb9d4768d1661bef1) Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.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.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 8b6ce77741..43acb3a7a0 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -40,11 +40,14 @@ automount_systemd() {
40 name="`basename "$DEVNAME"`" 40 name="`basename "$DEVNAME"`"
41 41
42 # Skip already mounted partitions 42 # Skip already mounted partitions
43 if [ -f /run/systemd/transient/run-media-$name.mount ]; then 43 if [ -f /run/systemd/transient/$(echo $MOUNT_BASE | cut -d '/' -f 2- | sed 's#/#-#g')-*$name.mount ]; then
44 logger "mount.sh/automount" "$MOUNT_BASE/$name already mounted" 44 logger "mount.sh/automount" "$MOUNT_BASE/$name already mounted"
45 return 45 return
46 fi 46 fi
47 47
48 # Get the unique name for mount point
49 get_label_name "${DEVNAME}"
50
48 # Only go for auto-mounting when the device has been cleaned up in remove 51 # Only go for auto-mounting when the device has been cleaned up in remove
49 # or has not been identified yet 52 # or has not been identified yet
50 if [ -e "/tmp/.automount-$name" ]; then 53 if [ -e "/tmp/.automount-$name" ]; then
@@ -61,9 +64,6 @@ automount_systemd() {
61 grep "^[[:space:]]*$tmp" /etc/fstab && return 64 grep "^[[:space:]]*$tmp" /etc/fstab && return
62 done 65 done
63 66
64 # Get the unique name for mount point
65 get_label_name "${DEVNAME}"
66
67 [ -d "$MOUNT_BASE/$name" ] || mkdir -p "$MOUNT_BASE/$name" 67 [ -d "$MOUNT_BASE/$name" ] || mkdir -p "$MOUNT_BASE/$name"
68 68
69 MOUNT="$MOUNT -o silent" 69 MOUNT="$MOUNT -o silent"