chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net_setup/networkd: warn if matching is done on possibly unstable ifname
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index df546dd8239b3657b5c03d2c7e489045ebe973ec..d9bd69742c1bd2a0024a413499330f99054b3371 100644
(file)
--- a/
src/udev/udevadm.c
+++ b/
src/udev/udevadm.c
@@
-26,12
+26,6
@@
#include "udev.h"
#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;
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();
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);
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':
break;
case 'h':
@@
-137,7
+129,7
@@
int main(int argc, char *argv[]) {
fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
rc = 2;
out:
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;
udev_unref(udev);
log_close();
return rc;