X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=d9912466ca91f5f5aea9258d0237e7543dab317f;hp=22b781d52a6750da644ac0b3808292e48d3ce8d8;hb=613ffbeb15e0507581e5037850c1ea5d56cd0928;hpb=66f74a2d1411e9761ac90c5a2f81d70b22ec936d

diff --git a/udevstart.c b/udevstart.c
index 22b781d52..d9912466c 100644
--- a/udevstart.c
+++ b/udevstart.c
@@ -47,6 +47,7 @@
 
 static const char *udev_run_str;
 static const char *udev_log_str;
+static struct udev_rules rules;
 
 #ifdef USE_LOG
 void log_message(int priority, const char *format, ...)
@@ -139,7 +140,7 @@ static int add_device(const char *path, const char *subsystem)
 		dbg("sysfs_open_class_device_path failed");
 		return -1;
 	}
-	udev_rules_get_name(&udev, class_dev);
+	udev_rules_get_name(&rules, &udev, class_dev);
 	if (udev.ignore_device) {
 		dbg("device event will be ignored");
 		goto exit;
@@ -358,13 +359,14 @@ int main(int argc, char *argv[], char *envp[])
 	sigaction(SIGTERM, &act, NULL);
 
 	/* trigger timeout to prevent hanging processes */
-	alarm(ALARM_TIMEOUT);
+	alarm(UDEV_ALARM_TIMEOUT);
 
-	udev_rules_init();
+	udev_rules_init(&rules, 1);
 
 	udev_scan_block();
 	udev_scan_class();
 
+	udev_rules_close(&rules);
 	logging_close();
 	return 0;
 }