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).

diff --git a/packages/udev/files/slugos/mount.sh b/packages/udev/files/slugos/mount.sh
index 11714c1..0990a7e 100644 (file)
--- a/packages/udev/files/slugos/mount.sh
+++ b/packages/udev/files/slugos/mount.sh
@@ -10,6 +10,12 @@ PMOUNT="/usr/bin/pmount"
 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" )

diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index c8840e1..1cd3c41 100644 (file)
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
 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 \