From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Mon, 21 Feb 2005 13:05:52 +0000 (+0100)
Subject: [PATCH] detect NAME="" as ignore_device rule
X-Git-Tag: 054~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69f57c6a2b94ae3b70a0ca43b46c30f8dce0a295;p=systemd

[PATCH] detect NAME="" as ignore_device rule
---

diff --git a/namedev.c b/namedev.c
index 0a37ef2f..a5c711bd 100644
--- a/namedev.c
+++ b/namedev.c
@@ -749,15 +749,6 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
 		dbg("process rule");
 		if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
 
-			/* FIXME: remove old style ignore rule and make OPTION="ignore" mandatory */
-			if (dev->name[0] == '\0' && dev->symlink[0] == '\0' &&
-			    dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0' &&
-			    !dev->ignore_device && !dev->partitions && !dev->ignore_remove) {
-				info("configured rule in '%s[%i]' applied, '%s' is ignored",
-				     dev->config_file, dev->config_line, udev->kernel_name);
-				return -1;
-			}
-
 			/* apply options */
 			if (dev->ignore_device) {
 				info("configured rule in '%s[%i]' applied, '%s' is ignored",
diff --git a/namedev_parse.c b/namedev_parse.c
index eabd9c98..7cd676c3 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -259,7 +259,10 @@ static int namedev_parse(const char *filename, void *data)
 						dev.ignore_remove = 1;
 					}
 				}
-				strfieldcpy(dev.name, temp3);
+				if (temp3[0] != '\0')
+					strfieldcpy(dev.name, temp3);
+				else
+					dev.ignore_device = 1;
 				valid = 1;
 				continue;
 			}