From 95b850fa3ae4674576a5ff7b5afd6c27b753b840 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Wed, 31 May 2017 19:51:16 +0000 Subject: systemd: remove automounting Switching to more robust script to manage media insertation, and removal. Change-Id: I5ca2a9bef6178184002316155693473ac68537ac Bug-AGL: SPEC-634 Signed-off-by: Matt Ranostay Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9601 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl/recipes-core/systemd/systemd/mount.sh | 90 -------------------------- 1 file changed, 90 deletions(-) delete mode 100644 meta-agl/recipes-core/systemd/systemd/mount.sh (limited to 'meta-agl/recipes-core/systemd/systemd/mount.sh') diff --git a/meta-agl/recipes-core/systemd/systemd/mount.sh b/meta-agl/recipes-core/systemd/systemd/mount.sh deleted file mode 100644 index 811e025bc..000000000 --- a/meta-agl/recipes-core/systemd/systemd/mount.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Called from udev -# -# Attempt to mount any added block devices and umount any removed devices - - -MOUNT="/bin/mount -o ro" -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 ]; - then - logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" - exit 0 - fi -done - -automount() { - name="`basename "$DEVNAME"`" - - ! 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" ] ; - 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 - vfat|fat) - MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" - ;; - # TODO - *) - ;; - esac - - if ! $MOUNT -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 -} - -rm_dir() { - # We do not want to rm -r populated directories - if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1" - then - ! test -z "$1" && rm -r "$1" - else - logger "mount.sh/automount" "Not removing non-empty directory [$1]" - fi -} - -# No ID_FS_TYPE for cdrom device, yet it should be mounted -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) - 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" -fi -- cgit 1.2.3-korg