X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_start.c;h=8c7a06b5afd8f6d9aa08c309b6871a7e0a7b1de6;hp=c1d877fb37dd42a85faff49f25ab931433fcbeb7;hb=8e2bf855bddfb8df2b61ad78cb082b7bf2af317e;hpb=7225821d631f37f3c2b11e1d62aeb516b2acec30

diff --git a/udev_start.c b/udev_start.c
index c1d877fb3..8c7a06b5a 100644
--- a/udev_start.c
+++ b/udev_start.c
@@ -35,7 +35,7 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "logging.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "list.h"
 #include "udev.h"
 
@@ -105,13 +105,13 @@ static int add_device(char *devpath, char *subsystem)
 		return -ENODEV;
 	}
 
-	udev_set_values(&udev, devpath, subsystem, "add");
+	udev_init_device(&udev, devpath, subsystem);
 	udev_add_device(&udev, class_dev);
 
 	/* run dev.d/ scripts if we created a node or changed a netif name */
-	if (udev.devname[0] != '\0') {
+	if (udev_dev_d && udev.devname[0] != '\0') {
 		setenv("DEVNAME", udev.devname, 1);
-		dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+		udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
 	}
 
 	sysfs_close_class_device(class_dev);
@@ -291,7 +291,7 @@ int udev_start(void)
 {
 	/* set environment for callouts and dev.d/ */
 	setenv("ACTION", "add", 1);
-	setenv("UDEVSTART", "1", 1);
+	setenv("UDEV_START", "1", 1);
 
 	udev_scan_class();
 	udev_scan_block();