X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.c;h=5c3d7d5d0646a81d98507a5124d5efde603cf5dd;hp=6bd28ad4b7981a5ee136d38c6a80cd666b416fa6;hb=68ab3e137b2ed017ca5d210dedfff702e21b25cf;hpb=019d6669076f52994cca199fbbae6eefbb96aeb8

diff --git a/udev_rules.c b/udev_rules.c
index 6bd28ad4b..5c3d7d5d0 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -532,7 +532,7 @@ found:
 			}
 			break;
 		case SUBST_TEMP_NODE:
-			if (udev->tmp_node[0] == '\0') {
+			if (udev->tmp_node[0] == '\0' && major(udev->devt) > 0) {
 				dbg("create temporary device node for callout");
 				snprintf(udev->tmp_node, sizeof(udev->tmp_node), "%s/.tmp-%u-%u",
 					 udev_root, major(udev->devt), minor(udev->devt));
@@ -831,18 +831,23 @@ try_parent:
 			char temp_value[NAME_SIZE];
 			const char *key_name = key_pair_name(rule, pair);
 			const char *value = key_val(rule, &pair->key);
-			char *key_value;
 
 			/* make sure we don't write to the same string we possibly read from */
 			strlcpy(temp_value, value, sizeof(temp_value));
 			udev_rules_apply_format(udev, temp_value, NAME_SIZE);
 
-			key_value = name_list_key_add(&udev->env_list, key_name, temp_value);
-			if (key_value == NULL)
-				break;
+			if (temp_value[0] == '\0') {
+				name_list_key_remove(&udev->env_list, key_name);
+				unsetenv(key_name);
+				info("unset ENV '%s'", key_name);
+			} else {
+				char *key_value = name_list_key_add(&udev->env_list, key_name, temp_value);
 
-			putenv(key_value);
-			dbg("export ENV '%s'", key_value);
+				if (key_value == NULL)
+					break;
+				putenv(key_value);
+				info("set ENV '%s'", key_value);
+			}
 		}
 	}