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

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index c4a272403..a4a86b664 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -196,7 +196,6 @@ struct token {
 				mode_t  mode;
 				uid_t uid;
 				gid_t gid;
-				int num_fake_part;
 				int devlink_prio;
 				int event_timeout;
 				int watch;
@@ -371,9 +370,6 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 	case TK_A_INOTIFY_WATCH:
 		dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch);
 		break;
-	case TK_A_NUM_FAKE_PART:
-		dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part);
-		break;
 	case TK_A_DEVLINK_PRIO:
 		dbg(rules->udev, "%s %s %u\n", token_str(type), operation_str(op), token->key.devlink_prio);
 		break;
@@ -1469,12 +1465,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 				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, "all_partitions") != NULL) {
-						int num = DEFAULT_FAKE_PARTITIONS_COUNT;
-
-						dbg(rules->udev, "creation of partition nodes requested\n");
-						rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
-					}
 					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);
@@ -1576,12 +1566,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 				else if (strncmp(pos, "replace", strlen("replace")) == 0)
 					rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, 0, NULL, NULL);
 			}
-			if (strstr(value, "all_partitions") != NULL) {
-				int num = DEFAULT_FAKE_PARTITIONS_COUNT;
-
-				rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
-				dbg(rules->udev, "creation of partition nodes requested\n");
-			}
 			pos = strstr(value, "nowatch");
 			if (pos != NULL) {
 				const int off = 0;
@@ -2055,13 +2039,12 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 	struct token *cur;
 	struct token *rule;
 	enum escape_type esc = ESCAPE_UNSET;
-	int can_set_name;
+	bool can_set_name;
 
 	if (rules->tokens == NULL)
 		return -1;
 
-	can_set_name = ((strcmp(udev_device_get_action(event->dev), "add") == 0 ||
-			 strcmp(udev_device_get_action(event->dev), "change") == 0) &&
+	can_set_name = ((strcmp(udev_device_get_action(event->dev), "remove") != 0) &&
 			(major(udev_device_get_devnum(event->dev)) > 0 ||
 			 strcmp(udev_device_get_subsystem(event->dev), "net") == 0));
 
@@ -2332,13 +2315,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 		case TK_A_STRING_ESCAPE_REPLACE:
 			esc = ESCAPE_REPLACE;
 			break;
-		case TK_A_NUM_FAKE_PART:
-			if (strcmp(udev_device_get_subsystem(event->dev), "block") != 0)
-				break;
-			if (udev_device_get_sysnum(event->dev) != NULL)
-				break;
-			udev_device_set_num_fake_partitions(event->dev, cur->key.num_fake_part);
-			break;
 		case TK_A_INOTIFY_WATCH:
 			event->inotify_watch = cur->key.watch;
 			break;