X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm.c;h=818edee38f1ecd53553c423e7e9b2659c4d2dce4;hb=dbf61afb29e016fe1b4ac48312a782df1d60a3e6;hp=0858c37be8ab735cef35b4361ac8409497cc0797;hpb=8fef0ff25c9fd7e5bb99d66f43c6357e4996a3cc;p=elogind.git diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index 0858c37be..818edee38 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -99,10 +99,10 @@ int main(int argc, char *argv[]) if (udev == NULL) goto out; - log_open(); log_parse_environment(); + log_open(); udev_set_log_fn(udev, udev_main_log); - udev_selinux_init(udev); + label_init("/dev"); for (;;) { int option; @@ -128,8 +128,6 @@ int main(int argc, char *argv[]) } command = argv[optind]; - log_debug("runtime dir '%s'\n", udev_get_run_path(udev)); - if (command != NULL) for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++) { if (strcmp(udevadm_cmds[i]->name, command) == 0) { @@ -145,7 +143,7 @@ int main(int argc, char *argv[]) adm_help(udev, argc, argv); rc = 2; out: - udev_selinux_exit(udev); + label_finish(); udev_unref(udev); log_close(); return rc;