X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules_parse.c;h=7c3c2e7fc252698aed9bb4be6c3d0c551a588b14;hb=39e54555a961fa6c4c8e7d260a0e208439dc0cfa;hp=a2f2f1804b2279470b5a0e786c3764e1967382d9;hpb=a72e3f666b897f94a64547ace3af74785d2f6771;p=elogind.git

diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index a2f2f1804..7c3c2e7fc 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -311,9 +311,13 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 			attr = get_key_attribute(key + sizeof("IMPORT")-1);
 			if (attr && strstr(attr, "program")) {
 				dbg("IMPORT will be executed");
-				rule->import_exec = 1;
+				rule->import_type  = IMPORT_PROGRAM;
 			} else if (attr && strstr(attr, "file")) {
 				dbg("IMPORT will be included as file");
+				rule->import_type  = IMPORT_FILE;
+			} else if (attr && strstr(attr, "parent")) {
+				dbg("IMPORT will include the parent values");
+				rule->import_type = IMPORT_PARENT;
 			} else {
 				/* figure it out if it is executable */
 				char file[PATH_SIZE];
@@ -326,8 +330,11 @@ static int add_to_rules(struct udev_rules *rules, char *line)
 					pos[0] = '\0';
 				dbg("IMPORT auto mode for '%s'", file);
 				if (!lstat(file, &stats) && (stats.st_mode & S_IXUSR)) {
-						dbg("IMPORT is executable, will be executed");
-						rule->import_exec = 1;
+					dbg("IMPORT is executable, will be executed (autotype)");
+					rule->import_type  = IMPORT_PROGRAM;
+				} else {
+					dbg("IMPORT is not executable, will be included as file (autotype)");
+					rule->import_type  = IMPORT_FILE;
 				}
 			}
 			add_rule_key(rule, &rule->import, operation, value);
@@ -548,6 +555,7 @@ static int rules_map(struct udev_rules *rules, const char *filename)
 		rules->buf = NULL;
 		return -1;
 	}
+	rules->mapped = 1;
 
 	return 0;
 }