chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevtest: print message before log output
[elogind.git]
/
udev_rules_parse.c
diff --git
a/udev_rules_parse.c
b/udev_rules_parse.c
index 8ef5ffee46431dd3e60510240eeb851d39e0af73..bfbad367e9d41e4dfda8f806e5b737c08099bb3c 100644
(file)
--- a/
udev_rules_parse.c
+++ b/
udev_rules_parse.c
@@
-104,12
+104,9
@@
static int get_key(char **line, char **key, enum key_operation *operation, char
break;
if (linepos[0] == '=')
break;
break;
if (linepos[0] == '=')
break;
- if (linepos[0] == '+')
- break;
- if (linepos[0] == '!')
- break;
- if (linepos[0] == ':')
- break;
+ if ((linepos[0] == '+') || (linepos[0] == '!') || (linepos[0] == ':'))
+ if (linepos[1] == '=')
+ break;
}
/* remember end of key */
}
/* remember end of key */
@@
-558,6
+555,8
@@
static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
}
if (strcasecmp(key, "OPTIONS") == 0) {
}
if (strcasecmp(key, "OPTIONS") == 0) {
+ const char *pos;
+
if (strstr(value, "last_rule") != NULL) {
dbg("last rule to be applied");
rule->last_rule = 1;
if (strstr(value, "last_rule") != NULL) {
dbg("last rule to be applied");
rule->last_rule = 1;
@@
-570,6
+569,11
@@
static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
dbg("remove event should be ignored");
rule->ignore_remove = 1;
}
dbg("remove event should be ignored");
rule->ignore_remove = 1;
}
+ pos = strstr(value, "link_priority=");
+ if (pos != NULL) {
+ rule->link_priority = atoi(&pos[strlen("link_priority=")]);
+ info("link priority=%i", rule->link_priority);
+ }
if (strstr(value, "all_partitions") != NULL) {
dbg("creation of partition nodes requested");
rule->partitions = DEFAULT_PARTITIONS_COUNT;
if (strstr(value, "all_partitions") != NULL) {
dbg("creation of partition nodes requested");
rule->partitions = DEFAULT_PARTITIONS_COUNT;