X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudevadm.c;h=047365d9733006f5c21f733bda45556a035820f0;hb=60865f33a1fee5bddc8add3963f44691996d2ceb;hp=863bc467f0fb31a8c5ad89c3aedee1862223f47e;hpb=742f4cad0d7c4af0a5d27ac6597be7410fa127e6;p=elogind.git

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 863bc467f..047365d97 100644
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -76,32 +76,32 @@ static int help(int argc, char *argv[])
 static const struct command cmds[] = {
 	{
 		.name = "info",
-		.cmd = udevinfo,
+		.cmd = udevadm_info,
 		.help = "query sysfs or the udev database",
 	},
 	{
 		.name = "trigger",
-		.cmd = udevtrigger,
+		.cmd = udevadm_trigger,
 		.help = "request events from the kernel",
 	},
 	{
 		.name = "settle",
-		.cmd = udevsettle, "",
+		.cmd = udevadm_settle, "",
 		.help = "wait for the event queue to finish",
 	},
 	{
 		.name = "control",
-		.cmd = udevcontrol,
+		.cmd = udevadm_control,
 		.help = "control the udev daemon",
 	},
 	{
 		.name = "monitor",
-		.cmd = udevmonitor,
+		.cmd = udevadm_monitor,
 		.help = "listen to kernel and udev events",
 	},
 	{
 		.name = "test",
-		.cmd = udevtest,
+		.cmd = udevadm_test,
 		.help = "simulation run",
 		.debug = 1,
 	},
@@ -125,6 +125,10 @@ int main(int argc, char *argv[])
 	const char *pos;
 	int rc;
 
+	logging_init("udevadm");
+	udev_config_init();
+	sysfs_init();
+
 	/* find command */
 	if (command != NULL)
 		for (i = 0; cmds[i].cmd != NULL; i++) {
@@ -169,5 +173,7 @@ int main(int argc, char *argv[])
 	fprintf(stderr, "unknown command, try help\n\n");
 	rc = 2;
 out:
+	sysfs_cleanup();
+	logging_close();
 	return rc;
 }