X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=a41f22277880be604ab4beef193847373110bbd0;hb=d4a32aa2e4804de9189574213749616dda57faa7;hp=480a1cdca224e595ff171898affaf9e2858bb54f;hpb=c6478ec1e128f0a92c2123ed110a651b88d43569;p=elogind.git

diff --git a/udev.c b/udev.c
index 480a1cdca..a41f22277 100644
--- a/udev.c
+++ b/udev.c
@@ -34,14 +34,9 @@
 #include "udev_lib.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-
+#include "logging.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -83,12 +78,7 @@ int main(int argc, char *argv[], char *envp[])
 	} act_type;
 
 	dbg("version %s", UDEV_VERSION);
-
-	main_argv = argv;
-	main_envp = envp;
-
 	logging_init("udev");
-
 	udev_init_config();
 
 	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
@@ -174,8 +164,11 @@ int main(int argc, char *argv[], char *envp[])
 		/* name, create node, store in db */
 		retval = udev_add_device(&udev, class_dev);
 
-		/* run scripts */
-		dev_d_execute(&udev);
+		/* run dev.d/ scripts if we created a node or changed a netif name */
+		if (udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+		}
 
 		sysfs_close_class_device(class_dev);
 		break;
@@ -186,7 +179,7 @@ int main(int argc, char *argv[], char *envp[])
 		retval = udev_remove_device(&udev);
 
 		/* run scripts */
-		dev_d_execute(&udev);
+		dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
 	}
 
 exit: