allow OPTIONS to be recognized for /sys/modules /sys/devices events

[elogind.git] / udev_rules_parse.c

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 36bf97177db4172be9f648f18d1c36195a0a6d5e..929a5e6f4cca15e3107a1158a22462d048b5f31a 100644 (file)
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -375,6 +375,35 @@ static int rules_parse(const char *filename)
                                continue;
                        }
 
+                       if (strncasecmp(key, KEY_IMPORT, sizeof(KEY_IMPORT)-1) == 0) {
+                               attr = get_key_attribute(key + sizeof(KEY_IMPORT)-1);
+                               if (attr && strstr(attr, "program")) {
+                                       dbg(KEY_IMPORT" will be executed");
+                                       rule.import_exec = 1;
+                               } else if (attr && strstr(attr, "file")) {
+                                       dbg(KEY_IMPORT" will be included as file");
+                               } else {
+                                       /* figure it out if it is executable */
+                                       char file[PATH_SIZE];
+                                       char *pos;
+                                       struct stat stats;
+
+                                       strlcpy(file, value, sizeof(file));
+                                       pos = strchr(file, ' ');
+                                       if (pos)
+                                               pos[0] = '\0';
+                                       dbg(KEY_IMPORT" auto mode for '%s'", file);
+                                       if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
+                                                       dbg(KEY_IMPORT" is executable, will be executed");
+                                                       rule.import_exec = 1;
+                                       }
+                               }
+                               strlcpy(rule.import, value, sizeof(rule.import));
+                               rule.import_operation = operation;
+                               valid = 1;
+                               continue;
+                       }
+
                        if (strcasecmp(key, KEY_DRIVER) == 0) {
                                strlcpy(rule.driver, value, sizeof(rule.driver));
                                rule.driver_operation = operation;
@@ -404,7 +433,6 @@ static int rules_parse(const char *filename)
                                                dbg("creation of partition nodes requested");
                                                rule.partitions = DEFAULT_PARTITIONS_COUNT;
                                        }
-                                       /* FIXME: remove old style option and make OPTIONS= mandatory */
                                        if (strstr(attr, OPTION_IGNORE_REMOVE) != NULL) {
                                                dbg("remove event should be ignored");
                                                rule.ignore_remove = 1;