udev-extraconf: Fix the recursively dependency for the systemd-mount

The commit 4ca9402c3720 ("udev-extraconf: Add systemd-mount to
udev-extraconf/mount.sh") uses the systemd-mount to mount the new added
disk partitions if systemd is used. But it forgot to move the codes
which tries to mount the partition by using the configuration in
/etc/fstab to the non-systemd function. And it will cause the
systemd-mount try to mount the partition synchronously and trigger a
recursively dependency like the following:
    dev-sda1.device -> run-media-sda1.mount -> dev-sda1.device

(From OE-Core rev: fcf6a4d629c05048cbb7298e285d84ff73a320d2)

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 14 insertions, 11 deletions

diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 34ef98a6a8..afb368dd67 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -66,6 +66,16 @@ automount_systemd() {
 automount() {
         name="`basename "$DEVNAME"`"
 
+        if [ -x "$PMOUNT" ]; then
+                $PMOUNT $DEVNAME 2> /dev/null
+        elif [ -x $MOUNT ]; then
+                $MOUNT $DEVNAME 2> /dev/null
+        fi
+
+        # If the device isn't mounted at this point, it isn't
+        # configured in fstab
+        grep -q "^$DEVNAME " /proc/mounts && return
+
         ! 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" ] ;
@@ -109,20 +119,13 @@ name="`basename "$DEVNAME"`"
 [ -e /sys/block/$name/device/media ] && media_type=`cat /sys/block/$name/device/media`
 
 if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_type" = "cdrom" ]; then
-        if [ -x "$PMOUNT" ]; then
-                $PMOUNT $DEVNAME 2> /dev/null
-        elif [ -x $MOUNT ]; then
-                $MOUNT $DEVNAME 2> /dev/null
-        fi
-
-        # If the device isn't mounted at this point, it isn't
-        # configured in fstab (note the root filesystem can show up as
-        # /dev/root in /proc/mounts, so check the device number too)
+    # Note the root filesystem can show up as /dev/root in /proc/mounts,
+    # so check the device number too
     if expr $MAJOR "*" 256 + $MINOR != `stat -c %d /`; then
         if [ "`basename $MOUNT`" = "systemd-mount" ];then
-            grep -q "^$DEVNAME " /proc/mounts || automount_systemd
+            automount_systemd
         else
-            grep -q "^$DEVNAME " /proc/mounts || automount
+            automount
         fi
     fi
 fi