X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=a9959c5d6b85cb631106addf567d0af81c242747;hp=3a715a609f48cf5e04dcc0411b2250553004fffe;hb=fb6e4c28248cdeed30a1d3eb42aba477f0429472;hpb=7d38d2287c882ffee02b5f285f2ee5bb60de0efa

diff --git a/udevstart.c b/udevstart.c
index 3a715a609..a9959c5d6 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -40,7 +40,6 @@
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev_libc_wrapper.h"
-#include "udev_sysfs.h"
 #include "udev.h"
 #include "udev_version.h"
 #include "logging.h"
@@ -139,7 +138,7 @@ static int add_device(const char *devpath, const char *subsystem)
 		return -1;
 	}
 
-	udev_init_device(&udev, devpath, subsystem, "add");
+	udev_init_device(&udev, &class_dev->path[strlen(sysfs_path)], subsystem, "add");
 	udev.devt = get_devt(class_dev);
 	if (!udev.devt && udev.type != DEV_NET) {
 		dbg("sysfs_open_class_device_path failed");
@@ -156,8 +155,6 @@ static int add_device(const char *devpath, const char *subsystem)
 	}
 
 	udev_add_device(&udev, class_dev);
-	if (udev.devname[0] != '\0')
-		setenv("DEVNAME", udev.devname, 1);
 run:
 	if (udev_run && !list_empty(&udev.run_list)) {
 		struct name_entry *name_loop;
@@ -167,7 +164,7 @@ run:
 			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
 				pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add");
 			else
-				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_DEBUG));
+				run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
 		}
 	}
 exit:
@@ -364,7 +361,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* trigger timeout to prevent hanging processes */
 	alarm(UDEV_ALARM_TIMEOUT);
 
-	udev_rules_init(&rules, 0, 1);
+	udev_rules_init(&rules, 1);
 
 	udev_scan_class(&device_list);
 	udev_scan_block(&device_list);