diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/udev/files/slugos | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/udev/files/slugos')
-rw-r--r-- | recipes/udev/files/slugos/mount.blacklist | 5 | ||||
-rw-r--r-- | recipes/udev/files/slugos/mount.sh | 83 |
2 files changed, 88 insertions, 0 deletions
diff --git a/recipes/udev/files/slugos/mount.blacklist b/recipes/udev/files/slugos/mount.blacklist new file mode 100644 index 0000000000..d9da5cfd71 --- /dev/null +++ b/recipes/udev/files/slugos/mount.blacklist @@ -0,0 +1,5 @@ +ram[0-9]$ +mtdblock[0-9]$ +hd[a-z]$ +sd[a-z]$ +loop[0-9]$ diff --git a/recipes/udev/files/slugos/mount.sh b/recipes/udev/files/slugos/mount.sh new file mode 100644 index 0000000000..0990a7e85a --- /dev/null +++ b/recipes/udev/files/slugos/mount.sh @@ -0,0 +1,83 @@ +#!/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"`" + +if ( blkid "$DEVNAME" | grep -q 'TYPE="mdraid"' ) +then + logger "udev/mount.sh" "[$DEVNAME] is a member of an array, ignoring" + exit 0 +fi + +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 $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 + # SlugOS: we pivot to the rootfs based on UUID, not on fstab -- so the fstab may not + # be correct at this point in the boot. So we must not let udev mount devices based + # soley on the fstab, lest we mount overtop the real rootfs. For now we just comment + # out the logic below and let the automount logic (far below) deal with all udev mount + # operations. + #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 |