From: Kay Sievers <kay.sievers@suse.de>
Date: Mon, 7 Nov 2005 15:00:41 +0000 (+0100)
Subject: let NAME="" supress node creation, but do RUN keys
X-Git-Tag: 174~2481
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=271c2d7d26132858a3302208dfe1572aa9cbbd12

let NAME="" supress node creation, but do RUN keys

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---

diff --git a/udev_event.c b/udev_event.c
index fae5a4659..b50fbf4c1 100644
--- a/udev_event.c
+++ b/udev_event.c
@@ -73,13 +73,12 @@ int udev_process_event(struct udev_rules *rules, struct udevice *udev)
 					sysfs_close_class_device(class_dev);
 					return -1;
 				}
-				if (udev->name[0] == '\0') {
+				if (udev->name[0] != '\0') {
+					/* create node, store in db */
+					retval = udev_add_device(udev, class_dev);
+				} else {
 					info("device node creation supressed");
-					sysfs_close_class_device(class_dev);
-					return -1;
 				}
-				/* create node, store in db */
-				retval = udev_add_device(udev, class_dev);
 			} else {
 				dbg("no dev-file found");
 				udev_rules_get_run(rules, udev, class_dev, NULL);
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 6e978d74b..9041c383e 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -413,12 +413,9 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					rule->ignore_remove = 1;
 				}
 			}
-			if (value[0] == '\0') {
-				dbg("name empty device should be ignored");
-				rule->name.operation = operation;
-				rule->ignore_device = 1;
-			} else
-				add_rule_key(rule, &rule->name, operation, value);
+			if (value[0] == '\0')
+				dbg("name empty, not creation supressed");
+			add_rule_key(rule, &rule->name, operation, value);
 			continue;
 		}