udev: Update omap3-pandora scripts and rules.

diff --git a/recipes/udev/files/omap3-pandora/local.rules b/recipes/udev/files/omap3-pandora/local.rules
index 266c3ff..c94e0df 100644 (file)
--- a/recipes/udev/files/omap3-pandora/local.rules
+++ b/recipes/udev/files/omap3-pandora/local.rules
@@ -24,4 +24,10 @@ SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
 # Local UDEV rule changes for the Pandora system.
 
 # Let all users access the event devices using EVDEV (the OpenPandora is not multiuser after all).
-KERNEL=="event[0-9]",MODE="0666"
\ No newline at end of file
+KERNEL=="event[0-9]", MODE="0666"
+KERNEL=="mice",                        NAME="input/%k", MODE="0666"
+KERNEL=="mouse[0-9]*",         NAME="input/%k", MODE="0666"
+KERNEL=="event[0-9]*",         NAME="input/%k", MODE="0666"
+KERNEL=="js[0-9]*",            NAME="input/%k", MODE="0666"
+KERNEL=="ts[0-9]*",            NAME="input/%k", MODE="0666"
+KERNEL=="uinput",              NAME="input/%k", MODE="0666"

diff --git a/recipes/udev/udev-151/omap3-pandora/mount.sh b/recipes/udev/udev-151/omap3-pandora/mount.sh
new file mode 100644 (file)
index 0000000..21440ee
--- /dev/null
+++ b/recipes/udev/udev-151/omap3-pandora/mount.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# Called from udev
+# Attemp to mount any added block devices 
+# and remove any removed devices
+#
+
+MOUNT="/bin/mount"
+PMOUNT="/usr/bin/pmount"
+UMOUNT="/bin/umount"
+name="`basename "$DEVNAME"`"
+
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+       if ( echo "$DEVNAME" | grep -q "$line" )
+       then
+               logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+               exit 0
+       fi
+done
+
+automount() {  
+       ! test -d "/media/$name" && mkdir -p "/media/$name"
+       
+       if ! $MOUNT -t auto -o sync,uid=1000 $DEVNAME "/media/$name" && ! $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
+               $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
+       # 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
+       #           its true device name so this would break. If the rootfs is mounted on two places
+       #           during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
+       #           to /etc/udev/mount.blacklist via postinst 
+
+       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