X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=4f18acaa7886cc7b7964647353f76aad8a278e64;hp=a4a86b664a6c770c9c33bf3c3cb4ad7b4533c9b4;hb=a89d342dfb45b54e29381af9dbc495bbb2b057af;hpb=06ba47d8336c6d017a67d11f480341db07b9bc4b

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a4a86b664..4f18acaa7 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1463,13 +1463,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 					err(rules->udev, "NAME=\"%%k\" is superfluous and breaks "
 					    "kernel supplied names, please remove it from %s:%u\n", filename, lineno);
 				rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
-				attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
-				if (attr != NULL) {
-					if (strstr(attr, "ignore_remove") != NULL) {
-						dbg(rules->udev, "remove event should be ignored\n");
-						rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
-					}
-				}
 			}
 			rule_tmp.rule.rule.flags = 1;
 			continue;
@@ -1540,10 +1533,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 		if (strcmp(key, "OPTIONS") == 0) {
 			const char *pos;
 
-			if (strstr(value, "ignore_remove") != NULL) {
-				dbg(rules->udev, "remove event should be ignored\n");
-				rule_add_key(&rule_tmp, TK_A_IGNORE_REMOVE, 0, NULL, NULL);
-			}
 			pos = strstr(value, "link_priority=");
 			if (pos != NULL) {
 				int prio = atoi(&pos[strlen("link_priority=")]);
@@ -2501,9 +2490,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		case TK_A_EVENT_TIMEOUT:
 			udev_device_set_event_timeout(event->dev, cur->key.event_timeout);
 			break;
-		case TK_A_IGNORE_REMOVE:
-			udev_device_set_ignore_remove(event->dev, 1);
-			break;
 		case TK_A_ATTR:
 			{
 				const char *key_name = &rules->buf[cur->key.attr_off];