summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorHector Palacios <hector.palacios@digi.com>2019-09-18 08:26:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 09:54:32 (GMT)
commiteba5dcddfa8de36c33b9eb258f187edbe0afe7a2 (patch)
tree6f3d3dde3ebe379fe15710db797ec6b4d5b63b94 /meta/recipes-core
parent9ad35b87070f67483dbc639c8274a6f30ae78165 (diff)
downloadpoky-eba5dcddfa8de36c33b9eb258f187edbe0afe7a2.tar.gz
udev-extraconf: skip mounting partitions already mounted by systemd
For some devices, udev may sometimes trigger twice the 'add' rule during boot. Calling the mount.sh script twice will eventually fail for already mounted partitions, but in that case, the script tries to remove the created mountpoint, when it shouldn't. This has been observed on USB sticks connected to a USB hub and may result in devices not being mounted if plugged-in before booting. This patch checks for already mounted partitions earlier (before creating the mount point) and returns with no actions. (From OE-Core rev: 4cf076879ac038ebf76679a19249ea6363e63e0f) Signed-off-by: Hector Palacios <hector.palacios@digi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/udev/udev-extraconf/mount.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 79eb014..b237318 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -38,6 +38,12 @@ done
38automount_systemd() { 38automount_systemd() {
39 name="`basename "$DEVNAME"`" 39 name="`basename "$DEVNAME"`"
40 40
41 # Skip already mounted partitions
42 if [ -f /run/systemd/transient/run-media-$name.mount ]; then
43 logger "mount.sh/automount" "/run/media/$name already mounted"
44 return
45 fi
46
41 # Skip the partition which are already in /etc/fstab 47 # Skip the partition which are already in /etc/fstab
42 grep "^[[:space:]]*$DEVNAME" /etc/fstab && return 48 grep "^[[:space:]]*$DEVNAME" /etc/fstab && return
43 for n in LABEL PARTLABEL UUID PARTUUID; do 49 for n in LABEL PARTLABEL UUID PARTUUID; do