[oe-commits] [openembedded-core] 04/13: Revert "udev-extraconf: Add systemd-mount to udev-extraconf/mount.sh"

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit e5fb84afe06377a0b28647460cf7a93553aa8031
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Sep 21 16:42:25 2018 +0100

    Revert "udev-extraconf: Add systemd-mount to udev-extraconf/mount.sh"
    
    This reverts commit 4ca9402c37205df4ea70c154f17b01c91a48176a.
---
 meta/recipes-core/udev/udev-extraconf/mount.sh | 83 ++++++--------------------
 meta/recipes-core/udev/udev-extraconf_1.1.bb   |  3 -
 2 files changed, 17 insertions(+), 69 deletions(-)

diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 067d4e2..d760328 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -4,28 +4,10 @@
 #
 # Attempt to mount any added block devices and umount any removed devices
 
-BASE_INIT="`readlink "@base_sbindir@/init"`"
-INIT_SYSTEMD="@systemd_unitdir@/systemd"
-
-if [ "x$BASE_INIT" = "x$INIT_SYSTEMD" ];then
-    # systemd as init uses systemd-mount to mount block devices
-    MOUNT="/usr/bin/systemd-mount"
-    UMOUNT="/usr/bin/systemd-umount"
-
-    if [ -x $MOUNT ] && [ -x $UMOUNT ];
-    then
-        logger "Using systemd-mount to finish mount"
-    else
-        logger "Linux init is using systemd, so please install systemd-mount to finish mount"
-        exit 1
-    fi
-else
-    MOUNT="/bin/mount"
-    UMOUNT="/bin/umount"
-fi
 
+MOUNT="/bin/mount"
 PMOUNT="/usr/bin/pmount"
-
+UMOUNT="/bin/umount"
 for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*`
 do
 	if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
@@ -35,35 +17,7 @@ do
 	fi
 done
 
-automount_systemd() {
-    name="`basename "$DEVNAME"`"
-
-    [ -d "/run/media/$name" ] || mkdir -p "/run/media/$name"
-
-    MOUNT="$MOUNT -o silent"
-
-    # If filesystemtype is vfat, change the ownership group to 'disk', and
-    # grant it with  w/r/x permissions.
-    case $ID_FS_TYPE in
-    vfat|fat)
-        MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`"
-        ;;
-    # TODO
-    *)
-        ;;
-    esac
-
-    if ! $MOUNT --no-block -t auto $DEVNAME "/run/media/$name"
-    then
-        #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/run/media/$name\" failed!"
-        rm_dir "/run/media/$name"
-    else
-        logger "mount.sh/automount" "Auto-mount of [/run/media/$name] successful"
-        touch "/tmp/.automount-$name"
-    fi
-}
-
-automount() {
+automount() {	
 	name="`basename "$DEVNAME"`"
 
 	! test -d "/run/media/$name" && mkdir -p "/run/media/$name"
@@ -72,7 +26,7 @@ automount() {
 	then
 		MOUNT="$MOUNT -o silent"
 	fi
-
+	
 	# If filesystem type is vfat, change the ownership group to 'disk', and
 	# grant it with  w/r/x permissions.
 	case $ID_FS_TYPE in
@@ -114,26 +68,23 @@ if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ] && [ -n "$ID_FS_TYPE" -o "$media_t
 	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)
-    if expr $MAJOR "*" 256 + $MINOR != `stat -c %d /`; then
-        if [ "`basename $MOUNT`" = "systemd-mount" ];then
-            grep -q "^$DEVNAME " /proc/mounts || automount_systemd
-        else
-            grep -q "^$DEVNAME " /proc/mounts || automount
-        fi
-    fi
+	if expr $MAJOR "*" 256 + $MINOR != `stat -c %d /`; then
+		grep -q "^$DEVNAME " /proc/mounts || automount
+	fi
 fi
 
-if [ "$ACTION" = "remove" ] || [ "$ACTION" = "change" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
-    for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
-    do
-        $UMOUNT $mnt
-    done
 
-    # Remove empty directories from auto-mounter
-    name="`basename "$DEVNAME"`"
-    test -e "/tmp/.automount-$name" && rm_dir "/run/media/$name"
+if [ "$ACTION" = "remove" ] || [ "$ACTION" = "change" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
+	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+	do
+		$UMOUNT $mnt
+	done
+	
+	# Remove empty directories from auto-mounter
+	name="`basename "$DEVNAME"`"
+	test -e "/tmp/.automount-$name" && rm_dir "/run/media/$name"
 fi
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb
index 90f933d..43a1cff 100644
--- a/meta/recipes-core/udev/udev-extraconf_1.1.bb
+++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb
@@ -29,9 +29,6 @@ do_install() {
     install -d ${D}${sysconfdir}/udev/scripts/
 
     install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-    sed -i 's|@systemd_unitdir@|${systemd_unitdir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh
-    sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${sysconfdir}/udev/scripts/mount.sh
-
     install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.