X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=53baa187e6fed214112a85461d3e22b1b5119075;hb=214a6c791cbc0c1a190c430eb37056087e661344;hp=174edfd9c4924b7ee33d119bc2552cd9aa2f958b;hpb=6133f3432fe86bc140cc9ba74794826f75c915fa;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 174edfd9c..53baa187e 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -270,7 +270,7 @@ static const char *token_str(enum token_type type)
 		[TK_M_PROGRAM] =		"M PROGRAM",
 		[TK_M_IMPORT_FILE] =		"M IMPORT_FILE",
 		[TK_M_IMPORT_PROG] =		"M IMPORT_PROG",
-		[TK_M_IMPORT_PARENT] =		"M MPORT_PARENT",
+		[TK_M_IMPORT_PARENT] =		"M IMPORT_PARENT",
 		[TK_M_RESULT] =			"M RESULT",
 		[TK_M_MAX] =			"M MAX",
 
@@ -718,8 +718,9 @@ static int import_property_from_string(struct udev_device *dev, char *line)
 		struct udev_list_entry *entry;
 
 		entry = udev_device_add_property(dev, key, val);
-		/* store in db */
-		udev_list_entry_set_flag(entry, 1);
+		/* store in db, skip private keys */
+		if (key[0] != '.')
+			udev_list_entry_set_flag(entry, 1);
 	}
 	return 0;
 }
@@ -785,8 +786,9 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
 
 			dbg(udev, "import key '%s=%s'\n", key, val);
 			entry = udev_device_add_property(dev, key, val);
-			/* store in db */
-			udev_list_entry_set_flag(entry, 1);
+			/* store in db, skip private keys */
+			if (key[0] != '.')
+				udev_list_entry_set_flag(entry, 1);
 		}
 	}
 	return 0;
@@ -1377,7 +1379,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			int flag = 0;
 
 			attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
-			if (attr != NULL && strstr(attr, "ignore_error"))
+			if (attr != NULL && strstr(attr, "fail_event_on_error"))
 				flag = 1;
 			rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
 			continue;
@@ -1506,7 +1508,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				int tout = atoi(&pos[strlen("event_timeout=")]);
 
 				rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
-				dbg(rules->udev, "event timout=%i\n", tout);
+				dbg(rules->udev, "event timeout=%i\n", tout);
 			}
 			pos = strstr(value, "string_escape=");
 			if (pos != NULL) {
@@ -2374,8 +2376,9 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 					udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
 					entry = udev_device_add_property(event->dev, name, temp_value);
-					/* store in db */
-					udev_list_entry_set_flag(entry, 1);
+					/* store in db, skip private keys */
+					if (name[0] != '.')
+						udev_list_entry_set_flag(entry, 1);
 				} else {
 					udev_device_add_property(event->dev, name, NULL);
 				}