chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: recreate from xml
[elogind.git]
/
udev_rules_parse.c
diff --git
a/udev_rules_parse.c
b/udev_rules_parse.c
index bc16f72e2c2cd662bea30d806719c59586e999ea..535b59590a0e21310f5c263168eb6ca83d6e7a2f 100644
(file)
--- a/
udev_rules_parse.c
+++ b/
udev_rules_parse.c
@@
-241,6
+241,7
@@
static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
char *linepos;
char *attr;
size_t padding;
char *linepos;
char *attr;
size_t padding;
+ int physdev = 0;
int retval;
/* get all the keys */
int retval;
/* get all the keys */
@@
-392,8
+393,7
@@
static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
goto invalid;
}
if (strncmp(attr, "PHYSDEV", 7) == 0)
goto invalid;
}
if (strncmp(attr, "PHYSDEV", 7) == 0)
- err("PHYSDEV* values are deprected and will be removed from a future kernel, "
- "please fix it in %s:%u", filename, lineno);
+ physdev = 1;
if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
goto invalid;
valid = 1;
if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
goto invalid;
valid = 1;
@@
-579,6
+579,10
@@
static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
err("unknown key '%s' in %s:%u", key, filename, lineno);
}
err("unknown key '%s' in %s:%u", key, filename, lineno);
}
+ if (physdev && rule->wait_for_sysfs.operation == KEY_OP_UNSET)
+ err("PHYSDEV* values are deprecated and will be removed from a future kernel, "
+ "please fix it in %s:%u", filename, lineno);
+
/* skip line if not any valid key was found */
if (!valid)
goto invalid;
/* skip line if not any valid key was found */
if (!valid)
goto invalid;