release 104

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index bc16f72e2c2cd662bea30d806719c59586e999ea..3f7e43f83943f9807dab969e9277fd981814e121 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;
+       int physdev = 0;
        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)
-                               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;
@@ -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);
        }
 
+       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;
@@ -623,7 +627,7 @@ static int parse_file(struct udev_rules *rules, const char *filename)
                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;
@@ -679,18 +683,18 @@ int udev_rules_init(struct udev_rules *rules, int resolve_names)
        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) {