diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-04-18 22:18:54 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-18 22:18:54 +0000 |
| commit | 488948e734ad107639099e558f5e6fb7dde6d7d9 (patch) | |
| tree | 56bfdff025634c1645981aabb9d27a69ba117261 | |
| parent | 9f59be500149641e1009090ac607cd7f84b9e1a2 (diff) | |
| parent | 044e0778328cf0ecc3ded99f014ead4bbcedaa7a (diff) | |
merge of 40d5e9c9fe36e79128f6aa23880c5666be230cfc
and a2ab0d3faec30d3c8b605acc999e9380620e2e5f
| -rw-r--r-- | packages/udev/files/mount.sh | 32 | ||||
| -rw-r--r-- | packages/udev/udev-084/udev.rules | 1 | ||||
| -rw-r--r-- | packages/udev/udev_084.bb | 2 |
3 files changed, 34 insertions, 1 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 diff --git a/packages/udev/udev-084/udev.rules b/packages/udev/udev-084/udev.rules index 7b4152c5bf..3ac51b301a 100644 --- a/packages/udev/udev-084/udev.rules +++ b/packages/udev/udev-084/udev.rules @@ -15,6 +15,7 @@ # SCSI devices BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" +SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod" # USB devices BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 30baa9e2fe..6ca02a5cfb 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -14,7 +14,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r5" +PR = "r6" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" |