From 6104109ceba1a1323e42d67a632921fb91184ab6 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Mon, 22 Oct 2018 19:58:40 +0800 Subject: udev-extraconf: Skip the entry in /etc/fstab when using the systemd-mount When using systemd, the systemd-fstab-generator would parse the /etc/fstab and create the corresponding unit dynamically. So we don't need to handle the ADD action for the partitions in /etc/fstab. Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- meta/recipes-core/udev/udev-extraconf/mount.sh | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meta/recipes-core/udev') diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index afb368dd67..3ee67b1318 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh @@ -38,6 +38,15 @@ done automount_systemd() { name="`basename "$DEVNAME"`" + # Skip the partition which are already in /etc/fstab + grep "^[[:space:]]*$DEVNAME" /etc/fstab && return + for n in LABEL PARTLABEL UUID PARTUUID; do + tmp="$(lsblk -o $n $DEVNAME | sed -e '1d')" + test -z "$tmp" && continue + tmp="$n=$tmp" + grep "^[[:space:]]*$tmp" /etc/fstab && return + done + [ -d "/run/media/$name" ] || mkdir -p "/run/media/$name" MOUNT="$MOUNT -o silent" -- cgit 1.2.3-korg