* udev_rules.c
*
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2 of the License.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
SUBST_PARENT,
SUBST_TEMP_NODE,
SUBST_ROOT,
- SUBST_MODALIAS,
SUBST_ENV,
};
static const struct subst_map {
{ .name = "parent", .fmt = 'P', .type = SUBST_PARENT },
{ .name = "tempnode", .fmt = 'N', .type = SUBST_TEMP_NODE },
{ .name = "root", .fmt = 'r', .type = SUBST_ROOT },
- { .name = "modalias", .fmt = 'A', .type = SUBST_MODALIAS },
{ .name = "env", .fmt = 'E', .type = SUBST_ENV },
{ NULL, '\0', 0 }
};
goto found;
}
}
- }
- else if (head[0] == '%') {
+ } else if (head[0] == '%') {
/* substitute format char */
if (head[1] == '\0')
break;
strlcat(string, udev_root, maxsize);
dbg("substitute udev_root '%s'", udev_root);
break;
- case SUBST_MODALIAS:
- {
- const char *value;
- static int warn = 1;
-
- if (warn) {
- err("$modalias is deprecated, use $env{MODALIAS} or "
- "$sysfs{modalias} instead.");
- warn = 0;
- }
-
- value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
- if (value != NULL) {
- strlcat(string, value, maxsize);
- dbg("substitute MODALIAS '%s'", temp2);
- }
- }
- break;
case SUBST_ENV:
if (attr == NULL) {
dbg("missing attribute");
char *key_value;
char *pos;
- if (key->operation == KEY_OP_UNSET)
+ if (key->operation != KEY_OP_MATCH &&
+ key->operation != KEY_OP_NOMATCH)
return 0;
strlcpy(value, rule->buf + key->val_off, sizeof(value));
if (match_key("DEVPATH", rule, &rule->devpath, udev->dev->devpath))
goto nomatch;
- if (rule->modalias.operation != KEY_OP_UNSET) {
- const char *value;
- static int warn = 1;
-
- if (warn) {
- err("MODALIAS is deprecated, use ENV{MODALIAS} or SYSFS{modalias} instead.");
- warn = 0;
- }
-
- value = sysfs_attr_get_value(udev->dev->devpath, "modalias");
- if (value == NULL) {
- dbg("MODALIAS value not found");
- goto nomatch;
- }
- if (match_key("MODALIAS", rule, &rule->modalias, value))
- goto nomatch;
- }
+ /* compare NAME against a previously assigned value */
+ if (match_key("NAME", rule, &rule->name, udev->name))
+ goto nomatch;
for (i = 0; i < rule->env.count; i++) {
struct key_pair *pair = &rule->env.keys[i];
/* we only check for matches, assignments will be handled later */
- if (pair->key.operation != KEY_OP_ASSIGN) {
+ if (pair->key.operation == KEY_OP_MATCH ||
+ pair->key.operation == KEY_OP_NOMATCH) {
const char *key_name = key_pair_name(rule, pair);
const char *value = getenv(key_name);
udev->dev_parent = udev->dev;
while (1) {
/* check for matching driver */
- if (rule->driver.operation != KEY_OP_UNSET) {
- if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
- goto try_parent;
- }
+ if (match_key("DRIVER", rule, &rule->driver, udev->dev_parent->driver))
+ goto try_parent;
/* check for matching subsystem/bus value */
- if (rule->bus.operation != KEY_OP_UNSET) {
- if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
- goto try_parent;
- }
+ if (match_key("BUS", rule, &rule->bus, udev->dev_parent->subsystem))
+ goto try_parent;
/* check for matching bus id (device name) */
- if (rule->id.operation != KEY_OP_UNSET) {
- if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
- goto try_parent;
- }
+ if (match_key("ID", rule, &rule->id, udev->dev_parent->kernel_name))
+ goto try_parent;
/* check for matching sysfs pairs */
if (rule->sysfs.count) {
if (pair->key.operation == KEY_OP_ASSIGN) {
const char *key_name = key_pair_name(rule, pair);
const char *value = key_val(rule, &pair->key);
+ char *key_value = name_list_key_add(&udev->env_list, key_name, value);
+ if (key_value == NULL)
+ break;
- name_list_key_add(&udev->env_list, key_name, value);
- setenv(key_name, value, 1);
- dbg("export ENV '%s=%s'", key_name, value);
+ udev_rules_apply_format(udev, key_value, NAME_SIZE);
+ putenv(key_value);
+ dbg("export ENV '%s'", key_value);
}
}
if (rule == NULL)
break;
- if (name_set && rule->name.operation != KEY_OP_UNSET) {
+ if (name_set &&
+ (rule->name.operation == KEY_OP_ASSIGN ||
+ rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+ rule->name.operation == KEY_OP_ADD)) {
dbg("node name already set, rule ignored");
continue;
}
}
/* set name, later rules with name set will be ignored */
- if (rule->name.operation != KEY_OP_UNSET) {
+ if (rule->name.operation == KEY_OP_ASSIGN ||
+ rule->name.operation == KEY_OP_ASSIGN_FINAL ||
+ rule->name.operation == KEY_OP_ADD) {
int count;
name_set = 1;
~ianmdlvl / elogind.git / blobdiff