From 1758389618b9d52af94c8a7ba40df3e63b707998 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 16:51:18 +0000 Subject: [PATCH] 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). --- packages/udev/files/slugos/mount.sh | 6 ++++++ packages/udev/udev_100.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/udev/files/slugos/mount.sh b/packages/udev/files/slugos/mount.sh index 11714c1390..0990a7e85a 100644 --- 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 c8840e1a8f..1cd3c41e82 100644 --- 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 \ -- 2.39.5