diff options
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.22.1.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/files/mdev-mount.sh | 63 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/files/mdev.conf | 3 |
5 files changed, 69 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index deb2ee4606..0769d92c50 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -270,6 +270,7 @@ do_install () { install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf install -d ${D}${sysconfdir}/mdev install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev + install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb index 8879e52962..dd61a2680c 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.22.1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-syslog.default \ file://mdev \ file://mdev.conf \ + file://mdev-mount.sh \ file://umount.busybox \ file://defconfig \ file://busybox-syslog.service.in \ diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index f2cc119400..f91b552f78 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb @@ -24,6 +24,7 @@ SRC_URI = "git://busybox.net/busybox.git \ file://busybox-syslog.default \ file://mdev \ file://mdev.conf \ + file://mdev-mount.sh \ file://umount.busybox \ file://defconfig \ file://busybox-syslog.service.in \ diff --git a/meta/recipes-core/busybox/files/mdev-mount.sh b/meta/recipes-core/busybox/files/mdev-mount.sh new file mode 100644 index 0000000000..d5d66d66fb --- /dev/null +++ b/meta/recipes-core/busybox/files/mdev-mount.sh @@ -0,0 +1,63 @@ +#!/bin/sh +MDEV_AUTOMOUNT=y +MDEV_AUTOMOUNT_ROOT=/run/media +[ -f /etc/default/mdev ] && . /etc/default/mdev +if [ "${MDEV_AUTOMOUNT}" = "n" ] ; then + exit 0 +fi + +case "$ACTION" in + add|"") + ACTION="add" + # check if already mounted + if grep -q "^/dev/${MDEV} " /proc/mounts ; then + # Already mounted + exit 0 + fi + DEVBASE=`expr substr $MDEV 1 3` + if [ "${DEVBASE}" == "mmc" ] ; then + DEVBASE=`expr substr $MDEV 1 7` + fi + # check for "please don't mount it" file + if [ -f "/dev/nomount.${DEVBASE}" ] ; then + # blocked + exit 0 + fi + # check for full-disk partition + if [ "${DEVBASE}" == "${MDEV}" ] ; then + if [ -d /sys/block/${DEVBASE}/${DEVBASE}*1 ] ; then + # Partition detected, just quit + exit 0 + fi + if [ ! -f /sys/block/${DEVBASE}/size ] ; then + # No size at all + exit 0 + fi + if [ `cat /sys/block/${DEVBASE}/size` == 0 ] ; then + # empty device, bail out + exit 0 + fi + fi + # first allow fstab to determine the mountpoint + if ! mount /dev/$MDEV > /dev/null 2>&1 + then + MOUNTPOINT="${MDEV_AUTOMOUNT_ROOT}/$MDEV" + mkdir "$MOUNTPOINT" + mount -t auto /dev/$MDEV "$MOUNTPOINT" + fi + ;; + remove) + MOUNTPOINT=`grep "^/dev/$MDEV\s" /proc/mounts | cut -d' ' -f 2` + if [ ! -z "$MOUNTPOINT" ] + then + umount "$MOUNTPOINT" + rmdir "$MOUNTPOINT" + else + umount /dev/$MDEV + fi + ;; + *) + # Unexpected keyword + exit 1 + ;; +esac diff --git a/meta/recipes-core/busybox/files/mdev.conf b/meta/recipes-core/busybox/files/mdev.conf index 6dfd161fa0..17e93da7c3 100644 --- a/meta/recipes-core/busybox/files/mdev.conf +++ b/meta/recipes-core/busybox/files/mdev.conf @@ -37,3 +37,6 @@ input/mice 0:0 0660 input/mouse.* 0:0 0660 tun[0-9]* 0:0 0660 =net/ + +[hs]d[a-z][0-9]? 0:0 660 */etc/mdev/mdev-mount.sh +mmcblk[0-9].* 0:0 660 */etc/mdev/mdev-mount.sh |