X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevadm.c;h=d9bd69742c1bd2a0024a413499330f99054b3371;hb=65eb4378c3e1de25383d8cd606909e64c71edc80;hp=2c11550467b9eac67aa33c719b6fcec2db4fa863;hpb=601185b43da638b1c74153deae01dbd518680889;p=elogind.git

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 2c1155046..d9bd69742 100644
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -26,12 +26,6 @@
 
 #include "udev.h"
 
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) {
-        log_metav(priority, file, line, fn, format, args);
-}
-
 static int adm_version(struct udev *udev, int argc, char *argv[]) {
         printf("%s\n", VERSION);
         return 0;
@@ -98,15 +92,13 @@ int main(int argc, char *argv[]) {
 
         log_parse_environment();
         log_open();
-        udev_set_log_fn(udev, udev_main_log);
-        label_init("/dev");
+        mac_selinux_init("/dev");
 
         while ((c = getopt_long(argc, argv, "+dhV", options, NULL)) >= 0)
                 switch (c) {
 
                 case 'd':
                         log_set_max_level(LOG_DEBUG);
-                        udev_set_log_priority(udev, LOG_DEBUG);
                         break;
 
                 case 'h':
@@ -134,10 +126,10 @@ int main(int argc, char *argv[]) {
                                 goto out;
                         }
 
-        fprintf(stderr, "%s: missing or unknown command", program_invocation_short_name);
+        fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
         rc = 2;
 out:
-        label_finish();
+        mac_selinux_finish();
         udev_unref(udev);
         log_close();
         return rc;