X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=126453cc892654751eb850e636870dc80be68ebb;hb=9af5bb2f8fdbf54c064ddbd319d61092f28a4132;hp=3ab45d4ec6a67c32788b5b35a621a6f43ccaa193;hpb=02fa9ae58920b431bc37182716dd863f1c482651;p=elogind.git

diff --git a/namedev.c b/namedev.c
index 3ab45d4ec..126453cc8 100644
--- a/namedev.c
+++ b/namedev.c
@@ -36,7 +36,7 @@
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
@@ -604,7 +604,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			}
 		}
 
-		/* check for matching kernel name*/
+		/* check for matching kernel name */
 		if (dev->kernel[0] != '\0') {
 			dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
 			if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
@@ -615,6 +615,28 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			}
 		}
 
+		/* check for matching subsystem */
+		if (dev->subsystem[0] != '\0') {
+			dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'", dev->subsystem, class_dev->name);
+			if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+				dbg(FIELD_SUBSYSTEM " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_SUBSYSTEM " matches");
+			}
+		}
+
+		/* check for matching driver */
+		if (dev->driver[0] != '\0') {
+			dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'", dev->driver, sysfs_device->driver_name);
+			if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+				dbg(FIELD_DRIVER " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_DRIVER " matches");
+			}
+		}
+
 		/* check for matching bus id */
 		if (dev->id[0] != '\0') {
 			dbg("check " FIELD_ID);
@@ -785,6 +807,12 @@ found:
 		goto done;
 
 	udev->partitions = dev->partitions;
+	udev->ignore_remove = dev->ignore_remove;
+
+	if (dev->group[0] != '\0') {
+		strfieldcpy(udev->group, dev->group);
+		apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);	
+	}
 
 	/* get permissions given in rule */
 	set_empty_perms(udev, dev->mode,