char *linepos;
char *attr;
size_t padding;
+ int physdev = 0;
int retval;
/* get all the keys */
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;
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;
err("can't open '%s' as rules file: %s", filename, strerror(errno));
return -1;
}
- dbg("reading '%s' as rules file", filename);
+ info("reading '%s' as rules file", filename);
/* loop through the whole file */
cur = 0;
rules->resolve_names = resolve_names;
/* parse rules file or all matching files in directory */
- if (stat(udev_rules_filename, &stats) != 0)
+ if (stat(udev_rules_dir, &stats) != 0)
return -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR) {
- dbg("parse single rules file '%s'", udev_rules_filename);
- retval = parse_file(rules, udev_rules_filename);
+ dbg("parse single rules file '%s'", udev_rules_dir);
+ retval = parse_file(rules, udev_rules_dir);
} else {
struct name_entry *name_loop, *name_tmp;
LIST_HEAD(name_list);
- dbg("parse rules directory '%s'", udev_rules_filename);
- retval = add_matching_files(&name_list, udev_rules_filename, RULEFILE_SUFFIX);
+ dbg("parse rules directory '%s'", udev_rules_dir);
+ retval = add_matching_files(&name_list, udev_rules_dir, RULESFILE_SUFFIX);
list_for_each_entry_safe(name_loop, name_tmp, &name_list, node) {
if (stat(name_loop->name, &stats) == 0) {