chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send monitor events back to netlink socket
[elogind.git]
/
udev
/
udevadm-monitor.c
diff --git
a/udev/udevadm-monitor.c
b/udev/udevadm-monitor.c
index 77d98facd5cff1f1f8b999d631f1df4905ab8ed6..43c1cc1163421a518a2279dd8987557aa1b88716 100644
(file)
--- a/
udev/udevadm-monitor.c
+++ b/
udev/udevadm-monitor.c
@@
-115,11
+115,6
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
print_udev =1;
}
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;
/* 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) {
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_MONITOR_UDEV
);
if (udev_monitor == NULL) {
rc = 1;
goto out;
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;
}
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) {
}
if (print_kernel) {
- kernel_monitor = udev_monitor_new_from_netlink(udev);
+ kernel_monitor = udev_monitor_new_from_netlink(udev
, UDEV_MONITOR_KERNEL
);
if (kernel_monitor == NULL) {
if (kernel_monitor == NULL) {
+ fprintf(stderr, "unable to subscribe to kernel events\n");
rc = 3;
goto out;
}
rc = 3;
goto out;
}
@@
-151,7
+147,7
@@
int udevadm_monitor(struct udev *udev, int argc, char *argv[])
rc = 4;
goto out;
}
rc = 4;
goto out;
}
- printf("UEVENT the kernel uevent\n");
+ printf("UEVENT
-
the kernel uevent\n");
}
printf("\n");
}
printf("\n");