chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: export udev_device_new_from_device_id()
[elogind.git]
/
src
/
udev
/
udevadm.c
diff --git
a/src/udev/udevadm.c
b/src/udev/udevadm.c
index 0858c37be8ab735cef35b4361ac8409497cc0797..818edee38f1ecd53553c423e7e9b2659c4d2dce4 100644
(file)
--- 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;
if (udev == NULL)
goto out;
- log_open();
log_parse_environment();
log_parse_environment();
+ log_open();
udev_set_log_fn(udev, udev_main_log);
udev_set_log_fn(udev, udev_main_log);
-
udev_selinux_init(udev
);
+
label_init("/dev"
);
for (;;) {
int option;
for (;;) {
int option;
@@
-128,8
+128,6
@@
int main(int argc, char *argv[])
}
command = argv[optind];
}
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) {
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:
adm_help(udev, argc, argv);
rc = 2;
out:
-
udev_selinux_exit(udev
);
+
label_finish(
);
udev_unref(udev);
log_close();
return rc;
udev_unref(udev);
log_close();
return rc;