[OE-core] [oe-core][PATCH 3/3] udev-extraconf/mount.sh: Skip the entry in /etc/fstab when using the systemd-mount

[Hongzhi.Song]

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 <kexin.hao at windriver.com>
Signed-off-by: Hongzhi.Song <hongzhi.song at windriver.com>
---
 meta/recipes-core/udev/udev-extraconf/mount.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 816d975e5e..9796cd7b90 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -36,6 +36,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
+
         ! test -d "/run/media/$name" && mkdir -p "/run/media/$name"
         # Silent util-linux's version of mounting auto
         MOUNT="$MOUNT -o silent"
-- 
2.11.0