[oe-commits] org.oe.dev SlugOS 5.0: udev - mount.sh script needs to use blkid to automatically

[mwester commit]

SlugOS 5.0: udev - mount.sh script needs to use blkid to automatically
blacklist members of a RAID array (lest we automount them, which may
happen, at least with the busybox mount command).

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: 0851655cce32da0b10bfd2ca7f07550b4ad0db3a
ViewMTN: http://monotone.openembedded.org/revision/info/0851655cce32da0b10bfd2ca7f07550b4ad0db3a
Files:
1
packages/udev/files/slugos/mount.sh
packages/udev/udev_100.bb
Diffs:

#
# mt diff -r76fc6ed3e7e5abd780c89e77b07cd5e6c062e438 -r0851655cce32da0b10bfd2ca7f07550b4ad0db3a
#
#
#
# patch "packages/udev/files/slugos/mount.sh"
#  from [9e59c21651fc2f3094b4be636f3d58bf29c2b0c7]
#    to [5ebced43f93b2ff039b0edda68aa50b7e9e594a9]
# 
# patch "packages/udev/udev_100.bb"
#  from [72309dab97aeccd4e512bd8d643d6467df4340e8]
#    to [fdf11aa59935fad400cc282a6f93096e726bef47]
#
============================================================
--- packages/udev/files/slugos/mount.sh	9e59c21651fc2f3094b4be636f3d58bf29c2b0c7
+++ packages/udev/files/slugos/mount.sh	5ebced43f93b2ff039b0edda68aa50b7e9e594a9
@@ -10,6 +10,12 @@ name="`basename "$DEVNAME"`"
 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" )
============================================================
--- packages/udev/udev_100.bb	72309dab97aeccd4e512bd8d643d6467df4340e8
+++ packages/udev/udev_100.bb	fdf11aa59935fad400cc282a6f93096e726bef47
@@ -9,7 +9,7 @@ needed to link programs with libvolume_i
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \