chiark / gitweb /
update SUSE rules
[elogind.git] / udevstart.c
index ce96f38879186c81d185f520393a2b18c4428166..11063f67991ce23e23ed6fbea3a82dcbe7f70bfc 100644 (file)
@@ -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");
@@ -364,7 +363,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);