don't print PHYSDEV* warnings for old WAIT_FOR_SYSFS rules
This commit is contained in:
parent
091a660d43
commit
7b5206d609
|
@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
|
||||||
char *linepos;
|
char *linepos;
|
||||||
char *attr;
|
char *attr;
|
||||||
size_t padding;
|
size_t padding;
|
||||||
|
int physdev = 0;
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
/* get all the keys */
|
/* get all the keys */
|
||||||
|
@ -392,8 +393,7 @@ static int add_to_rules(struct udev_rules *rules, char *line, const char *filena
|
||||||
goto invalid;
|
goto invalid;
|
||||||
}
|
}
|
||||||
if (strncmp(attr, "PHYSDEV", 7) == 0)
|
if (strncmp(attr, "PHYSDEV", 7) == 0)
|
||||||
err("PHYSDEV* values are deprected and will be removed from a future kernel, "
|
physdev = 1;
|
||||||
"please fix it in %s:%u", filename, lineno);
|
|
||||||
if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
|
if (add_rule_key_pair(rule, &rule->env, operation, attr, value) != 0)
|
||||||
goto invalid;
|
goto invalid;
|
||||||
valid = 1;
|
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 deprected 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 */
|
/* skip line if not any valid key was found */
|
||||||
if (!valid)
|
if (!valid)
|
||||||
goto invalid;
|
goto invalid;
|
||||||
|
|
Loading…
Reference in a new issue