chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: when dumping string property values escape the chars we use as end-of-line and...
[elogind.git]
/
src
/
test
/
test-udev.c
diff --git
a/src/test/test-udev.c
b/src/test/test-udev.c
index f085262b01a479a06e9b6d351f14ef983a7da9c7..8a51473419da1989341118364cb5d23f7f5fe846 100644
(file)
--- a/
src/test/test-udev.c
+++ b/
src/test/test-udev.c
@@
-99,7
+99,7
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
log_debug("version %s", VERSION);
return EXIT_FAILURE;
log_debug("version %s", VERSION);
-
label
_init("/dev");
+
mac_selinux
_init("/dev");
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
sigprocmask(SIG_SETMASK, NULL, &sigmask_orig);
@@
-149,7
+149,7
@@
int main(int argc, char *argv[]) {
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));
-
util_delete_path(udev, udev_device_get_devnode(dev)
);
+
rmdir_parents(udev_device_get_devnode(dev), "/"
);
}
}
}
}
@@
-158,7
+158,7
@@
int main(int argc, char *argv[]) {
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
out:
if (event != NULL && event->fd_signal >= 0)
close(event->fd_signal);
-
label
_finish();
+
mac_selinux
_finish();
return err ? EXIT_FAILURE : EXIT_SUCCESS;
}
return err ? EXIT_FAILURE : EXIT_SUCCESS;
}