summaryrefslogtreecommitdiff
path: root/src/selinux-setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/selinux-setup.c')
-rw-r--r--src/selinux-setup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/selinux-setup.c b/src/selinux-setup.c
index fdc316048a..dc101b13ba 100644
--- a/src/selinux-setup.c
+++ b/src/selinux-setup.c
@@ -30,6 +30,7 @@
#endif
#include "selinux-setup.h"
+#include "mount-setup.h"
#include "macro.h"
#include "util.h"
#include "log.h"
@@ -45,6 +46,9 @@ int selinux_setup(bool *loaded_policy) {
assert(loaded_policy);
+ /* Make sure getcon() works, which needs /proc and /sys */
+ mount_setup_early();
+
/* Already initialized by somebody else? */
r = getcon_raw(&con);
if (r == 0) {
@@ -71,7 +75,7 @@ int selinux_setup(bool *loaded_policy) {
/* Transition to the new context */
r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);
- if (r < 0) {
+ if (r < 0 || label == NULL) {
log_open();
log_error("Failed to compute init label, ignoring.");
} else {