X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=ce9b42f30db510519cc6c0d9f7f8883cbd15e4cb;hb=db60d377b0c2a6d3d64b9775c581309f04c11b8e;hp=5728be59e0d435c8107cfa803957cc971854ead8;hpb=821d0ec803a72841f173739f5b713fe847edab75;p=elogind.git

diff --git a/udev.c b/udev.c
index 5728be59e..ce9b42f30 100644
--- a/udev.c
+++ b/udev.c
@@ -204,6 +204,9 @@ int main(int argc, char *argv[], char *envp[])
 			retval = udev_remove_device(&udev);
 		}
 
+		if (udev.devname[0] != '\0')
+			setenv("DEVNAME", udev.devname, 1);
+
 		if (udev_run && !list_empty(&udev.run_list)) {
 			struct name_entry *name_loop;
 
@@ -213,11 +216,9 @@ int main(int argc, char *argv[], char *envp[])
 		}
 
 		/* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-		if (udev.devname[0] != '\0') {
-			setenv("DEVNAME", udev.devname, 1);
-			if (udev_dev_d)
-				udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
-		}
+		if (udev_dev_d && udev.devname[0] != '\0')
+			udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
 	} else if (udev.type == DEV_DEVICE) {
 		if (strcmp(action, "add") == 0) {
 			/* wait for sysfs */