X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=ac29ec6f4424909fcd9799ec1db1fbeb3dc421ce;hp=272afbab6e7ae8b3d8937f091ddf11382b527eae;hb=4af58c70571c5c63edaff20d2032c8eeb59678b6;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a diff --git a/udev.c b/udev.c index 272afbab6..ac29ec6f4 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,6 +112,9 @@ 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) { @@ -143,6 +137,9 @@ int main(int argc, char **argv, char **envp) } udevdb_exit(); -exit: + /* disconnect from the system message bus */ + sysbus_disconnect(); + +exit: return retval; }