X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=71c5f1fba538f33043495d231650722db7992e09;hp=272afbab6e7ae8b3d8937f091ddf11382b527eae;hb=1d936fbca0b93dd9cc7a71983ca1a8ea890f181d;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a

diff --git a/udev.c b/udev.c
index 272afbab6..71c5f1fba 100644
--- a/udev.c
+++ b/udev.c
@@ -31,6 +31,7 @@
 
 #include "udev.h"
 #include "udev_version.h"
+#include "udev_dbus.h"
 #include "namedev.h"
 #include "udevdb.h"
 #include "libsysfs/libsysfs.h"
@@ -39,16 +40,6 @@
 char **main_argv;
 char **main_envp;
 
-char sysfs_path[SYSFS_PATH_MAX];
-char udev_config_dir[PATH_MAX];
-char udev_root[PATH_MAX];
-char udev_db_filename[PATH_MAX+NAME_MAX];
-char udev_permission_filename[PATH_MAX+NAME_MAX];
-char udev_rules_filename[PATH_MAX+NAME_MAX];
-char udev_config_filename[PATH_MAX+NAME_MAX];
-char default_mode_str[NAME_MAX];
-
-
 static inline char *get_action(void)
 {
 	char *action;
@@ -121,11 +112,14 @@ int main(int argc, char **argv, char **envp)
 	/* initialize our configuration */
 	udev_init_config();
 
+	/* connect to the system message bus */
+	sysbus_connect();
+
 	/* initialize udev database */
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
 		dbg("unable to initialize database");
-		goto exit;
+		goto exit_sysbus;
 	}
 
 	/* initialize the naming deamon */
@@ -143,6 +137,10 @@ int main(int argc, char **argv, char **envp)
 	}
 	udevdb_exit();
 
-exit:	
+exit_sysbus:
+	/* disconnect from the system message bus */
+	sysbus_disconnect();
+
+exit:
 	return retval;
 }