diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-05-31 01:13:03 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-05-31 01:13:03 +0200 |
| commit | c4f6dcc4a5c774c4c5c60c7024d59081deecc7f8 (patch) | |
| tree | 9cfd869d655c733493e6807b4ccbb39c6d8a9b90 /udev | |
| parent | 1182b9470f61ca00fb600f9af0c148f1e6c04355 (diff) | |
add IMPORT{cmdline}
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-rules.c | 48 | ||||
| -rw-r--r-- | udev/udev.xml | 7 |
2 files changed, 55 insertions, 0 deletions
diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 11948cacce..0676c51dfe 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -143,6 +143,7 @@ enum token_type { TK_M_IMPORT_FILE, /* val */ TK_M_IMPORT_PROG, /* val */ TK_M_IMPORT_DB, /* val */ + TK_M_IMPORT_CMDLINE, /* val */ TK_M_IMPORT_PARENT, /* val */ TK_M_RESULT, /* val */ TK_M_MAX, @@ -276,6 +277,7 @@ static const char *token_str(enum token_type type) [TK_M_IMPORT_FILE] = "M IMPORT_FILE", [TK_M_IMPORT_PROG] = "M IMPORT_PROG", [TK_M_IMPORT_DB] = "M IMPORT_DB", + [TK_M_IMPORT_CMDLINE] = "M IMPORT_CMDLINE", [TK_M_IMPORT_PARENT] = "M IMPORT_PARENT", [TK_M_RESULT] = "M RESULT", [TK_M_MAX] = "M MAX", @@ -342,6 +344,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: case TK_M_IMPORT_DB: + case TK_M_IMPORT_CMDLINE: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_NAME: @@ -1010,6 +1013,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: case TK_M_IMPORT_DB: + case TK_M_IMPORT_CMDLINE: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_OWNER: @@ -1402,6 +1406,9 @@ static int add_rule(struct udev_rules *rules, char *line, } else if (attr != NULL && strstr(attr, "db")) { dbg(rules->udev, "IMPORT will include db values\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL); + } else if (attr != NULL && strstr(attr, "cmdline")) { + dbg(rules->udev, "IMPORT will include db values\n"); + rule_add_key(&rule_tmp, TK_M_IMPORT_CMDLINE, op, value, NULL); } else if (attr != NULL && strstr(attr, "parent")) { dbg(rules->udev, "IMPORT will include the parent values\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL); @@ -2329,6 +2336,47 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event } break; } + case TK_M_IMPORT_CMDLINE: + { + FILE *f; + bool imported = false; + + f = fopen("/proc/cmdline", "r"); + if (f != NULL) { + char cmdline[4096]; + + if (fgets(cmdline, sizeof(cmdline), f) != NULL) { + const char *key = &rules->buf[cur->key.value_off]; + char *pos; + + pos = strstr(cmdline, key); + if (pos != NULL) { + struct udev_list_entry *entry; + + pos += strlen(key); + if (pos[0] == '\0' || isspace(pos[0])) { + /* we import simple flags as 'FLAG=1' */ + entry = udev_device_add_property(event->dev, key, "1"); + udev_list_entry_set_flags(entry, 1); + imported = true; + } else if (pos[0] == '=') { + const char *value = &pos[1]; + + while (pos[0] != '\0' && !isspace(pos[0])) + pos++; + pos[0] = '\0'; + entry = udev_device_add_property(event->dev, key, value); + udev_list_entry_set_flags(entry, 1); + imported = true; + } + } + } + fclose(f); + } + if (!imported && cur->key.op != OP_NOMATCH) + goto nomatch; + break; + } case TK_M_IMPORT_PARENT: { char import[UTIL_PATH_SIZE]; diff --git a/udev/udev.xml b/udev/udev.xml index c517766f97..b971fadea6 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -438,6 +438,13 @@ </listitem> </varlistentry> <varlistentry> + <term><option>cmdline</option></term> + <listitem> + <para>Import a single property from the kernel commandline. For simple flags + the value of the property will be set to '1'.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>parent</option></term> <listitem> <para>Import the stored keys from the parent device by reading |