TK_M_DEVLINK, /* val */
TK_M_NAME, /* val */
TK_M_ENV, /* val, attr */
+ TK_M_TAG, /* val */
TK_M_SUBSYSTEM, /* val */
TK_M_DRIVER, /* val */
TK_M_WAITFOR, /* val */
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 */
TK_A_GROUP_ID, /* gid_t */
TK_A_MODE_ID, /* mode_t */
TK_A_ENV, /* val, attr */
+ TK_A_TAG, /* val */
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 */
mode_t mode;
uid_t uid;
gid_t gid;
- int num_fake_part;
int devlink_prio;
int event_timeout;
int watch;
[TK_M_DEVLINK] = "M DEVLINK",
[TK_M_NAME] = "M NAME",
[TK_M_ENV] = "M ENV",
+ [TK_M_TAG] = "M TAG",
[TK_M_SUBSYSTEM] = "M SUBSYSTEM",
[TK_M_DRIVER] = "M DRIVER",
[TK_M_WAITFOR] = "M WAITFOR",
[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",
[TK_A_GROUP_ID] = "A GROUP_ID",
[TK_A_MODE_ID] = "A MODE_ID",
[TK_A_ENV] = "A ENV",
+ [TK_A_TAG] = "A ENV",
[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",
dbg(rules->udev, "%s %s '%s' '%s'(%s)\n",
token_str(type), operation_str(op), attr, value, string_glob_str(glob));
break;
+ case TK_M_TAG:
+ case TK_A_TAG:
+ dbg(rules->udev, "%s %s '%s'\n", token_str(type), operation_str(op), value);
+ 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:
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;
case TK_A_MODE:
case TK_A_NAME:
case TK_A_GOTO:
+ case TK_M_TAG:
+ case TK_A_TAG:
token->key.value_off = add_string(rule_tmp->rules, value);
break;
case TK_M_ENV:
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;
continue;
}
+ if (strcmp(key, "TAG") == 0) {
+ if (op < OP_MATCH_MAX)
+ rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL);
+ else
+ rule_add_key(&rule_tmp, TK_A_TAG, op, value, NULL);
+ continue;
+ }
+
if (strcmp(key, "PROGRAM") == 0) {
rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
continue;
if (op < OP_MATCH_MAX) {
rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
} else {
- if (value[0] == '\0')
- info(rules->udev, "name empty, node creation suppressed\n");
- else if (strcmp(value, "%k") == 0)
- 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, "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);
- }
+ if (strcmp(value, "%k") == 0) {
+ err(rules->udev, "NAME=\"%%k\" is ignored, because it breaks kernel supplied names, "
+ "please remove it from %s:%u\n", filename, lineno);
+ continue;
+ }
+ if (value[0] == '\0') {
+ info(rules->udev, "NAME=\"\" is ignored, because udev will not delete any device nodes, "
+ "please remove it from %s:%u\n", filename, lineno);
+ continue;
}
+ rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
}
rule_tmp.rule.rule.flags = 1;
continue;
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=")]);
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;
goto nomatch;
break;
}
+ case TK_M_TAG:
+ {
+ struct udev_list_entry *list_entry;
+ bool match = false;
+
+ udev_list_entry_foreach(list_entry, udev_device_get_tags_list_entry(event->dev)) {
+ if (strcmp(&rules->buf[cur->key.value_off], udev_list_entry_get_name(list_entry)) == 0) {
+ match = true;
+ break;
+ }
+ }
+ if (!match && (cur->key.op != OP_NOMATCH))
+ goto nomatch;
+ break;
+ }
case TK_M_SUBSYSTEM:
if (match_key(rules, cur, udev_device_get_subsystem(event->dev)) != 0)
goto nomatch;
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;
}
break;
}
+ case TK_A_TAG:
+ if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
+ udev_device_cleanup_tags_list(event->dev);
+ udev_device_add_tag(event->dev, &rules->buf[cur->key.value_off]);
+ break;
case TK_A_NAME:
{
const char *name = &rules->buf[cur->key.value_off];
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];
~ianmdlvl / elogind.git / blobdiff