X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.c;h=3e2182ae7b8f7c3678bc66f966409f3b8ae24476;hb=1b9410278e40850bdcedb2fdfc0f815361b1c303;hp=6685596479ac14102246ab40c555b51886ceb303;hpb=8a08e4b1906eef5d5cb585b125612cce8d565e5c;p=elogind.git

diff --git a/namedev.c b/namedev.c
index 668559647..3e2182ae7 100644
--- a/namedev.c
+++ b/namedev.c
@@ -313,6 +313,19 @@ exit:
 	return; /* here to prevent compiler warning... */
 }
 
+static void fix_kernel_name(struct udevice *udev)
+{
+	char *temp = udev->kernel_name;
+
+	while (*temp != 0x00) {
+		/* Some block devices have a ! in their name, 
+		 * we need to change that to / */
+		if (*temp == '!')
+			*temp = '/';
+		++temp;
+	}
+}
+
 static int execute_program(char *path, char *value, int len)
 {
 	int retval;
@@ -589,12 +602,12 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 		if (dev->bus[0] != '\0') {
 			if (sysfs_device == NULL) {
 				dbg("device has no bus");
-				goto no_good;
+				goto try_parent;
 			}
 			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
 			if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
 				dbg(FIELD_BUS " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_BUS " matches");
 			}
@@ -605,7 +618,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			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) {
 				dbg(FIELD_KERNEL " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_KERNEL " matches");
 			}
@@ -616,7 +629,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			dbg("check " FIELD_ID);
 			if (match_id(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_ID " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_ID " matches");
 			}
@@ -627,7 +640,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			dbg("check " FIELD_PLACE);
 			if (match_place(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_PLACE " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_PLACE " matches");
 			}
@@ -638,7 +651,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			dbg("check " FIELD_SYSFS " pairs");
 			if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
 				dbg(FIELD_SYSFS " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_SYSFS " matches");
 			}
@@ -650,7 +663,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			apply_format(udev, dev->program);
 			if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
 				dbg(FIELD_PROGRAM " returned nozero");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_PROGRAM " returned successful");
 			}
@@ -663,22 +676,17 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			    dev->result, udev->program_result);
 			if (strcmp_pattern(dev->result, udev->program_result) != 0) {
 				dbg(FIELD_RESULT " is not matching");
-				goto no_good;
+				goto try_parent;
 			} else {
 				dbg(FIELD_RESULT " matches");
 			}
 		}
 
-		/* check if we are instructed to ignore this device */
-		if (dev->name[0] == '\0') {
-			dbg("instructed to ignore this device");
-			return -1;
-		}
-
 		/* Yeah, we matched! */
 		return 0;
 
-no_good:
+try_parent:
+		dbg("try parent sysfs device");
 		sysfs_device = sysfs_get_device_parent(sysfs_device);
 		if (sysfs_device == NULL)
 			return -ENODEV;
@@ -706,11 +714,12 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 		dbg("sysfs_device->bus='%s'", sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
 		wait_for_device_to_initialize(sysfs_device);
-	} else {
-		dbg("class_dev->name = '%s'", class_dev->name);
 	}
+	dbg("class_dev->name = '%s'", class_dev->name);
 
 	strfieldcpy(udev->kernel_name, class_dev->name);
+	fix_kernel_name(udev);
+	dbg("udev->kernel_name = '%s'", udev->kernel_name);
 
 	/* get kernel number */
 	pos = class_dev->name + strlen(class_dev->name);
@@ -722,11 +731,15 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	/* look for a matching rule to apply */
 	list_for_each_entry(dev, &config_device_list, node) {
 		dbg("process rule");
-
 		if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
-			/* Yup, this rule belongs to us! */
+			if (dev->name[0] == '\0') {
+				info("configured rule in '%s' at line %i applied, '%s' is ignored",
+				     udev_rules_filename, dev->config_line, udev->kernel_name);
+				return -1;
+			}
+
 			info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
-			    udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+			     udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
 			strfieldcpy(udev->name, dev->name);
 			strfieldcpy(udev->symlink, dev->symlink);
 			goto found;