chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-analyze: switch to python getopt for argument parsing
[elogind.git]
/
src
/
test
/
test-udev.c
diff --git
a/src/test/test-udev.c
b/src/test/test-udev.c
index b843e5f6481e7464f59ba4e364ce5da3f5b1df57..64bb5cbc3b82e7045c346e7e93f16787433c5950 100644
(file)
--- a/
src/test/test-udev.c
+++ b/
src/test/test-udev.c
@@
-50,7
+50,7
@@
int main(int argc, char *argv[])
if (udev == NULL)
exit(EXIT_FAILURE);
log_debug("version %s\n", VERSION);
if (udev == NULL)
exit(EXIT_FAILURE);
log_debug("version %s\n", VERSION);
-
udev_selinux_init(udev
);
+
label_init("/dev"
);
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
@@
-96,7
+96,7
@@
int main(int argc, char *argv[])
mode |= S_IFCHR;
if (strcmp(action, "remove") != 0) {
mode |= S_IFCHR;
if (strcmp(action, "remove") != 0) {
-
util_create_path(udev, udev_device_get_devnode(dev)
);
+
mkdir_parents(udev_device_get_devnode(dev), 0755
);
mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
} else {
unlink(udev_device_get_devnode(dev));
mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
} else {
unlink(udev_device_get_devnode(dev));
@@
-113,7
+113,7
@@
out:
udev_event_unref(event);
udev_device_unref(dev);
udev_rules_unref(rules);
udev_event_unref(event);
udev_device_unref(dev);
udev_rules_unref(rules);
-
udev_selinux_exit(udev
);
+
label_finish(
);
udev_unref(udev);
if (err != 0)
return EXIT_FAILURE;
udev_unref(udev);
if (err != 0)
return EXIT_FAILURE;