diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-04-12 15:58:05 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-04-12 15:58:05 +0200 |
| commit | 5539f624e18e948e4e3a1f0d9f5d25de9c8fd8b8 (patch) | |
| tree | 56a0bfe869f4439f5205a260cb456e1b9c1a9e98 /udev | |
| parent | 0ec5b5e1429307fa7573aaa9b8f25fbd9b1d71d5 (diff) | |
allow IMPORT{db}="KEY"
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-rules.c | 26 | ||||
| -rw-r--r-- | udev/udev.xml | 8 |
2 files changed, 33 insertions, 1 deletions
diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 60daad520a..c4a2724032 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org> + * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org> * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk> * * This program is free software: you can redistribute it and/or modify @@ -141,6 +141,7 @@ enum token_type { TK_M_PROGRAM, /* val */ TK_M_IMPORT_FILE, /* val */ TK_M_IMPORT_PROG, /* val */ + TK_M_IMPORT_DB, /* val */ TK_M_IMPORT_PARENT, /* val */ TK_M_RESULT, /* val */ TK_M_MAX, @@ -271,6 +272,7 @@ static const char *token_str(enum token_type type) [TK_M_PROGRAM] = "M PROGRAM", [TK_M_IMPORT_FILE] = "M IMPORT_FILE", [TK_M_IMPORT_PROG] = "M IMPORT_PROG", + [TK_M_IMPORT_DB] = "M IMPORT_DB", [TK_M_IMPORT_PARENT] = "M IMPORT_PARENT", [TK_M_RESULT] = "M RESULT", [TK_M_MAX] = "M MAX", @@ -337,6 +339,7 @@ static void dump_token(struct udev_rules *rules, struct token *token) case TK_M_PROGRAM: case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: + case TK_M_IMPORT_DB: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_NAME: @@ -1001,6 +1004,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type, case TK_M_PROGRAM: case TK_M_IMPORT_FILE: case TK_M_IMPORT_PROG: + case TK_M_IMPORT_DB: case TK_M_IMPORT_PARENT: case TK_M_RESULT: case TK_A_OWNER: @@ -1379,6 +1383,9 @@ static int add_rule(struct udev_rules *rules, char *line, } else if (attr != NULL && strstr(attr, "file")) { dbg(rules->udev, "IMPORT will be included as file\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL); + } 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, "parent")) { dbg(rules->udev, "IMPORT will include the parent values\n"); rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL); @@ -2288,6 +2295,23 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event goto nomatch; break; } + case TK_M_IMPORT_DB: + { + const char *key = &rules->buf[cur->key.value_off]; + const char *value; + + value = udev_device_get_property_value(event->dev_db, key); + if (value != NULL) { + struct udev_list_entry *entry; + + entry = udev_device_add_property(event->dev, key, value); + udev_list_entry_set_flags(entry, 1); + } else { + if (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 b6c5933419..175cdbec6b 100644 --- a/udev/udev.xml +++ b/udev/udev.xml @@ -399,6 +399,14 @@ </listitem> </varlistentry> <varlistentry> + <term><option>db</option></term> + <listitem> + <para>Import a single property specified as the assigned value from the + current device database. This works only if the database is already populated + by an earlier event.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>parent</option></term> <listitem> <para>Import the stored keys from the parent device by reading |