chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "extras/keymap: Fix case matching for Micro-Star"
[elogind.git]
/
udev
/
udev-rules.c
diff --git
a/udev/udev-rules.c
b/udev/udev-rules.c
index a174d5db40ef6dfdb88f9e8eb6cc796898277d41..eeb71bc87b9d6eb0906b671bb7ab81f64495d79e 100644
(file)
--- a/
udev/udev-rules.c
+++ b/
udev/udev-rules.c
@@
-270,7
+270,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_PROGRAM] = "M PROGRAM",
[TK_M_IMPORT_FILE] = "M IMPORT_FILE",
[TK_M_IMPORT_PROG] = "M IMPORT_PROG",
- [TK_M_IMPORT_PARENT] = "M MPORT_PARENT",
+ [TK_M_IMPORT_PARENT] = "M
I
MPORT_PARENT",
[TK_M_RESULT] = "M RESULT",
[TK_M_MAX] = "M MAX",
[TK_M_RESULT] = "M RESULT",
[TK_M_MAX] = "M MAX",
@@
-1379,7
+1379,7
@@
static int add_rule(struct udev_rules *rules, char *line,
int flag = 0;
attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
int flag = 0;
attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
- if (attr != NULL && strstr(attr, "
ignore
_error"))
+ if (attr != NULL && strstr(attr, "
fail_event_on
_error"))
flag = 1;
rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
continue;
flag = 1;
rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
continue;
@@
-1406,6
+1406,9
@@
static int add_rule(struct udev_rules *rules, char *line,
} else {
if (value[0] == '\0')
info(rules->udev, "name empty, node creation suppressed\n");
} 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) {
rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
if (attr != NULL) {
@@
-1508,7
+1511,7
@@
static int add_rule(struct udev_rules *rules, char *line,
int tout = atoi(&pos[strlen("event_timeout=")]);
rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
int tout = atoi(&pos[strlen("event_timeout=")]);
rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
- dbg(rules->udev, "event timout=%i\n", tout);
+ dbg(rules->udev, "event tim
e
out=%i\n", tout);
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
}
pos = strstr(value, "string_escape=");
if (pos != NULL) {
@@
-1795,7
+1798,7
@@
struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
parse_file(rules, filename, filename_off);
else
if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
parse_file(rules, filename, filename_off);
else
-
info
(udev, "can not read '%s'\n", filename);
+
err
(udev, "can not read '%s'\n", filename);
udev_list_entry_delete(file_loop);
}
udev_list_entry_delete(file_loop);
}