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

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a4a86b664..f5d23b45b 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -149,7 +149,6 @@ enum token_type {
 	TK_A_STRING_ESCAPE_NONE,
 	TK_A_STRING_ESCAPE_REPLACE,
 	TK_A_INOTIFY_WATCH,		/* int */
-	TK_A_NUM_FAKE_PART,		/* int */
 	TK_A_DEVLINK_PRIO,		/* int */
 	TK_A_OWNER,			/* val */
 	TK_A_GROUP,			/* val */
@@ -161,7 +160,6 @@ enum token_type {
 	TK_A_NAME,			/* val */
 	TK_A_DEVLINK,			/* val */
 	TK_A_EVENT_TIMEOUT,		/* int */
-	TK_A_IGNORE_REMOVE,
 	TK_A_ATTR,			/* val, attr */
 	TK_A_RUN,			/* val, bool */
 	TK_A_GOTO,			/* size_t */
@@ -279,7 +277,6 @@ static const char *token_str(enum token_type type)
 		[TK_A_STRING_ESCAPE_NONE] =	"A STRING_ESCAPE_NONE",
 		[TK_A_STRING_ESCAPE_REPLACE] =	"A STRING_ESCAPE_REPLACE",
 		[TK_A_INOTIFY_WATCH] = 		"A INOTIFY_WATCH",
-		[TK_A_NUM_FAKE_PART] =		"A NUM_FAKE_PART",
 		[TK_A_DEVLINK_PRIO] =		"A DEVLINK_PRIO",
 		[TK_A_OWNER] =			"A OWNER",
 		[TK_A_GROUP] =			"A GROUP",
@@ -291,7 +288,6 @@ static const char *token_str(enum token_type type)
 		[TK_A_NAME] =			"A NAME",
 		[TK_A_DEVLINK] =		"A DEVLINK",
 		[TK_A_EVENT_TIMEOUT] =		"A EVENT_TIMEOUT",
-		[TK_A_IGNORE_REMOVE] =		"A IGNORE_REMOVE",
 		[TK_A_ATTR] =			"A ATTR",
 		[TK_A_RUN] =			"A RUN",
 		[TK_A_GOTO] =			"A GOTO",
@@ -360,9 +356,6 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_IGNORE_REMOVE:
-		dbg(rules->udev, "%s\n", token_str(type));
-		break;
 	case TK_M_TEST:
 		dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
 		    token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
@@ -1030,14 +1023,11 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 		break;
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_IGNORE_REMOVE:
-		break;
 	case TK_A_RUN:
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		token->key.fail_on_error = *(int *)data;
 		break;
 	case TK_A_INOTIFY_WATCH:
-	case TK_A_NUM_FAKE_PART:
 	case TK_A_DEVLINK_PRIO:
 		token->key.devlink_prio = *(int *)data;
 		break;
@@ -1463,13 +1453,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 +1523,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 +2480,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];