chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: automatically load policy if the initrd hasn't done this for us yet
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 83cf2e70578e971c6c5f16984189859d50222d6d..f7d76a2941d6b9af3816ab8cc6d3980d5b4dc6e3 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-39,6
+39,7
@@
#include "loopback-setup.h"
#include "kmod-setup.h"
#include "locale-setup.h"
#include "loopback-setup.h"
#include "kmod-setup.h"
#include "locale-setup.h"
+#include "selinux-setup.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
@@
-895,6
+896,11
@@
int main(int argc, char *argv[]) {
arg_running_as = MANAGER_SYSTEM;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
arg_running_as = MANAGER_SYSTEM;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ /* This might actually not return, but cause a
+ * reexecution */
+ if (selinux_setup(argv) < 0)
+ goto finish;
+
if (label_init() < 0)
goto finish;
} else {
if (label_init() < 0)
goto finish;
} else {