diff options
Diffstat (limited to 'packages/udev/files')
| -rw-r--r-- | packages/udev/files/mount.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/packages/udev/files/mount.sh b/packages/udev/files/mount.sh index 010b7289f2..48c7844690 100644 --- a/packages/udev/files/mount.sh +++ b/packages/udev/files/mount.sh @@ -8,6 +8,7 @@ MOUNT="/bin/mount" PMOUNT="/usr/bin/pmount" UMOUNT="/bin/umount" +name="`basename "$DEVNAME"`" for line in `cat /etc/udev/mount.blacklist | grep -v ^#` do @@ -17,7 +18,29 @@ do exit 0 fi done + +automount() { + ! test -d "/media/$name" && mkdir -p "/media/$name" + + if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name" + then + #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!" + rm_dir "/media/$name" + else + logger "mount.sh/automount" "Auto-mount of [/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 +} if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then if [ -x "$PMOUNT" ]; then @@ -25,11 +48,20 @@ if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then 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 + cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount + fi + + if [ "$ACTION" = "remove" ] && [ -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 + test -e "/tmp/.automount-$name" && rm_dir "/media/$name" fi |