diff options
| author | John Klug <john.klug@multitech.com> | 2019-07-25 14:20:07 -0500 |
|---|---|---|
| committer | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2020-05-20 13:44:06 +0300 |
| commit | 63ef7d25b4fc2132102d90dd5f915500616658e2 (patch) | |
| tree | 4159ef25e740572d971a4309408d5c22c9368fa5 /recipes-core | |
| parent | 8ae8bf8ee9c5dffdbbe441ac0b1a11acc9f3f34d (diff) | |
| download | meta-mlinux-atmel-63ef7d25b4fc2132102d90dd5f915500616658e2.tar.gz meta-mlinux-atmel-63ef7d25b4fc2132102d90dd5f915500616658e2.tar.bz2 meta-mlinux-atmel-63ef7d25b4fc2132102d90dd5f915500616658e2.zip | |
Move mount.patch forward for Yocto Thud
Diffstat (limited to 'recipes-core')
| -rw-r--r-- | recipes-core/udev/udev-extraconf/mount.patch | 55 |
1 files changed, 19 insertions, 36 deletions
diff --git a/recipes-core/udev/udev-extraconf/mount.patch b/recipes-core/udev/udev-extraconf/mount.patch index 71ccc56..0c62873 100644 --- a/recipes-core/udev/udev-extraconf/mount.patch +++ b/recipes-core/udev/udev-extraconf/mount.patch @@ -1,44 +1,27 @@ diff -Naru old/mount.sh new/mount.sh ---- old/mount.sh 2018-05-15 09:07:02.814673114 -0500 -+++ new/mount.sh 2018-05-15 09:06:30.862674060 -0500 -@@ -4,7 +4,6 @@ - # - # Attempt to mount any added block devices and umount any removed devices +--- old/mount.sh 2019-07-25 13:22:28.209140732 -0500 ++++ new/mount.sh 2019-07-25 14:07:12.797061256 -0500 +@@ -49,6 +49,11 @@ -- - MOUNT="/bin/mount" - PMOUNT="/usr/bin/pmount" - UMOUNT="/bin/umount" -@@ -21,6 +20,10 @@ - name="`basename "$DEVNAME"`" + [ -d "/run/media/$name" ] || mkdir -p "/run/media/$name" - ! test -d "/run/media/$name" && mkdir -p "/run/media/$name" -+ if [ "$name" = mmcblk0p1 ] ; -+ then -+ ln -sf /run/media/$name /run/media/card -+ fi - # Silent util-linux's version of mounting auto - if [ "x`readlink $MOUNT`" = "x/bin/mount.util-linux" ] ; - then -@@ -31,7 +34,7 @@ - # grant it with w/r/x permissions. - case $ID_FS_TYPE in - vfat|fat) -- MOUNT="$MOUNT -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" -+ MOUNT="$MOUNT -o errors=continue -o umask=007,gid=`awk -F':' '/^disk/{print $3}' /etc/group`" - ;; - # TODO - *) -@@ -66,7 +69,11 @@ ++ if [ "$name" = mmcblk0p1 ] ; then ++ ln -sf /run/media/$name ++ /run/media/card ++ fi ++ + MOUNT="$MOUNT -o silent" + + # If filesystemtype is vfat, change the ownership group to 'disk', and +@@ -78,7 +83,11 @@ if [ -x "$PMOUNT" ]; then $PMOUNT $DEVNAME 2> /dev/null elif [ -x $MOUNT ]; then -- $MOUNT $DEVNAME 2> /dev/null -+ if [[ $ID_FS_TYPE =~ fat ]] ; then -+ $MOUNT -o umask=002,gid=disk $DEVNAME 2> /dev/null -+ else -+ $MOUNT $DEVNAME 2> /dev/null -+ fi ++ if [[ $ID_FS_TYPE =~ fat ]] ; then ++ $MOUNT -o umask=002,gid=disk $DEVNAME 2> /dev/null ++ else + $MOUNT $DEVNAME 2> /dev/null ++ fi fi - + # If the device isn't mounted at this point, it isn't |