udevd: log error for too old kernels or CONFIG_SYSFS_DEPRECATED

[elogind.git] / udev / udevadm-monitor.c

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index d5992ceb6c5cc7fc522a7672b5bde5078958456b..d8ec066467e9fbb001d3587b7580e80bc08b1e67 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -77,10 +77,10 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
        int rc = 0;
 
        static const struct option options[] = {
-               { "environment", 0, NULL, 'e' },
-               { "kernel", 0, NULL, 'k' },
-               { "udev", 0, NULL, 'u' },
-               { "help", 0, NULL, 'h' },
+               { "environment", no_argument, NULL, 'e' },
+               { "kernel", no_argument, NULL, 'k' },
+               { "udev", no_argument, NULL, 'u' },
+               { "help", no_argument, NULL, 'h' },
                {}
        };
 
@@ -104,7 +104,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                               "  --env    print the whole event environment\n"
                               "  --kernel print kernel uevents\n"
                               "  --udev   print udev events\n"
-                              "  --help   print this help text\n\n");
+                              "  --help\n\n");
                default:
                        goto out;
                }
@@ -115,11 +115,6 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                print_udev =1;
        }
 
-       if (getuid() != 0 && print_kernel) {
-               fprintf(stderr, "root privileges needed to subscribe to kernel events\n");
-               goto out;
-       }
-
        /* set signal handlers */
        memset(&act, 0x00, sizeof(struct sigaction));
        act.sa_handler = (void (*)(int)) sig_handler;
@@ -130,7 +125,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
        printf("monitor will print the received events for:\n");
        if (print_udev) {
-               udev_monitor = udev_monitor_new_from_socket(udev, "@/org/kernel/udev/monitor");
+               udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
                if (udev_monitor == NULL) {
                        rc = 1;
                        goto out;
@@ -139,11 +134,12 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        rc = 2;
                        goto out;
                }
-               printf("UDEV the event which udev sends out after rule processing\n");
+               printf("UDEV - the event which udev sends out after rule processing\n");
        }
        if (print_kernel) {
-               kernel_monitor = udev_monitor_new_from_netlink(udev);
+               kernel_monitor = udev_monitor_new_from_netlink(udev, "kernel");
                if (kernel_monitor == NULL) {
+                       fprintf(stderr, "unable to subscribe to kernel events\n");
                        rc = 3;
                        goto out;
                }
@@ -151,7 +147,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        rc = 4;
                        goto out;
                }
-               printf("UEVENT the kernel uevent\n");
+               printf("KERNEL - the kernel uevent\n");
        }
        printf("\n");
 
@@ -178,7 +174,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                        device = udev_monitor_receive_device(kernel_monitor);
                        if (device == NULL)
                                continue;
-                       print_device(device, "UEVENT", env);
+                       print_device(device, "KERNEL", env);
                        udev_device_unref(device);
                }