There's a bug here, I'm test v2 now... :)
On Thu, Jan 30, 2014 at 07:28:27PM -0500, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <[email protected]> > > This will be modified to fix SD mounting issues. > > Signed-off-by: Denys Dmytriyenko <[email protected]> > --- > .../recipes-core/udev/udev-extraconf/mount.sh | 76 > ++++++++++++++++++++++ > .../recipes-core/udev/udev-extraconf_1.0.bb | 4 ++ > 2 files changed, 80 insertions(+) > create mode 100644 > meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh > create mode 100644 meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bb > > diff --git a/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh > b/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh > new file mode 100644 > index 0000000..d1419ed > --- /dev/null > +++ b/meta-arago-distro/recipes-core/udev/udev-extraconf/mount.sh > @@ -0,0 +1,76 @@ > +#!/bin/sh > +# > +# Called from udev > +# > +# Attempt to mount any added block devices and umount any removed devices > + > + > +MOUNT="/bin/mount" > +PMOUNT="/usr/bin/pmount" > +UMOUNT="/bin/umount" > +for line in `grep -v ^# /etc/udev/mount.blacklist` > +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 "/media/$name" && mkdir -p "/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 ! $MOUNT -t auto $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" ] && [ -n "$ID_FS_TYPE" ]; 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" ] && [ -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 "/media/$name" > +fi > diff --git a/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bb > b/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bb > new file mode 100644 > index 0000000..c0ab069 > --- /dev/null > +++ b/meta-arago-distro/recipes-core/udev/udev-extraconf_1.0.bb > @@ -0,0 +1,4 @@ > +# look for files in this layer first > +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > + > +PR_append = "-arago0" > -- > 1.8.3.2 > _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
