diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-24 21:24:04 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-24 21:24:04 +0100 |
| commit | ae2d346642aee4fab33c88708627bcf5b0cb317d (patch) | |
| tree | 3807235acf0ddf0ec6cd352fa94d2753d3978462 /udev/udev-rules.c | |
| parent | f408fd919a7af5fcd5dac5a505411842b3e8d853 (diff) | |
silence PHYSDEV* warning for WAIT_FOR* rules
Diffstat (limited to 'udev/udev-rules.c')
| -rw-r--r-- | udev/udev-rules.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/udev/udev-rules.c b/udev/udev-rules.c index df9fc7877d..afd2e884e9 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -1135,6 +1135,7 @@ static int add_rule(struct udev_rules *rules, char *line, char *linepos; char *attr; int physdev = 0; + int waitfor = 0; struct rule_tmp rule_tmp; memset(&rule_tmp, 0x00, sizeof(struct rule_tmp)); @@ -1395,6 +1396,7 @@ static int add_rule(struct udev_rules *rules, char *line, if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) { rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL); valid = 1; + waitfor = 1; continue; } @@ -1544,11 +1546,11 @@ static int add_rule(struct udev_rules *rules, char *line, err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno); } - if (physdev) - err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, \n" - "please fix it in %s:%u", filename, lineno); + if (physdev && !waitfor) + err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, " + "please fix it in %s:%u\n", filename, lineno); - /* skip line if not any valid key was found */ + /* skip line if no valid key was found */ if (!valid) goto invalid; |