reset process priority before executing RUN+=

[elogind.git] / udev / udev-rules.c

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 6eb8350343c3f7c55391376b2d9c2c7f40190d23..8fc804a3c2a863e7758514f97b4e686d7a15ed47 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -125,6 +125,7 @@ enum token_type {
        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 */
@@ -157,6 +158,7 @@ enum token_type {
        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 */
@@ -253,6 +255,7 @@ static const char *token_str(enum token_type type)
                [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",
@@ -285,6 +288,7 @@ static const char *token_str(enum token_type type)
                [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",
@@ -354,6 +358,10 @@ static void dump_token(struct udev_rules *rules, struct token *token)
                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:
                dbg(rules->udev, "%s\n", token_str(type));
@@ -739,7 +747,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
        char *line;
 
        envp = udev_device_get_properties_envp(dev);
-       if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0)
+       if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL, false) != 0)
                return -1;
 
        line = result;
@@ -1003,6 +1011,8 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
        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:
@@ -1350,6 +1360,14 @@ static int add_rule(struct udev_rules *rules, char *line,
                        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;
@@ -1450,11 +1468,16 @@ static int add_rule(struct udev_rules *rules, char *line,
                        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);
+                               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;
@@ -2093,6 +2116,21 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                        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;
@@ -2217,7 +2255,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                     program,
                                     &rules->buf[rule->rule.filename_off],
                                     rule->rule.filename_line);
-                               if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
+                               if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL, false) != 0) {
                                        if (cur->key.op != OP_NOMATCH)
                                                goto nomatch;
                                } else {
@@ -2408,6 +2446,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
                                }
                                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];