]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox: Fix mdev block device automounting
authorKhem Raj <raj.khem@gmail.com>
Wed, 21 Oct 2015 03:40:20 +0000 (20:40 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 Nov 2015 11:13:55 +0000 (11:13 +0000)
The directory ${MDEV_AUTOMOUNT_ROOT}/ which is '/run/media' may not
exist yet when the device is found, so lets use -p switch to mkdir cmd
so it create preceding parent dirs if needed.

Remove some bash specific constructs

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/busybox/files/mdev-mount.sh

index d5d66d66fbd0f853b79325774595f6298d66393b..b4385a157f2ad39f3da7fc8d284347bcd0317c8a 100644 (file)
@@ -15,7 +15,7 @@ case "$ACTION" in
                        exit 0
                fi
                DEVBASE=`expr substr $MDEV 1 3`
-               if [ "${DEVBASE}" == "mmc" ] ; then
+               if [ "${DEVBASE}" = "mmc" ] ; then
                        DEVBASE=`expr substr $MDEV 1 7`
                fi
                # check for "please don't mount it" file
@@ -24,7 +24,7 @@ case "$ACTION" in
                        exit 0
                fi
                # check for full-disk partition
-               if [ "${DEVBASE}" == "${MDEV}" ] ; then
+               if [ "${DEVBASE}" = "${MDEV}" ] ; then
                        if [ -d /sys/block/${DEVBASE}/${DEVBASE}*1 ] ; then
                                # Partition detected, just quit
                                exit 0
@@ -33,7 +33,7 @@ case "$ACTION" in
                                # No size at all
                                exit 0
                        fi
-                       if [ `cat /sys/block/${DEVBASE}/size` == 0 ] ; then
+                       if [ "`cat /sys/block/${DEVBASE}/size`" = "0" ] ; then
                                # empty device, bail out
                                exit 0
                        fi
@@ -42,7 +42,7 @@ case "$ACTION" in
                if ! mount /dev/$MDEV > /dev/null 2>&1
                then
                        MOUNTPOINT="${MDEV_AUTOMOUNT_ROOT}/$MDEV"
-                       mkdir "$MOUNTPOINT"
+                       mkdir -p "$MOUNTPOINT"
                        mount -t auto /dev/$MDEV "$MOUNTPOINT"
                fi
                ;;