chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: do not read system boot timestamps in systemd --user mode
[elogind.git]
/
src
/
core
/
selinux-setup.c
diff --git
a/src/core/selinux-setup.c
b/src/core/selinux-setup.c
index fa025b72687ad0d4e0863a3589a610f20b05e6d2..9a5d6b2a9ddd655d3329c8d1a07f9e8e22740530 100644
(file)
--- a/
src/core/selinux-setup.c
+++ b/
src/core/selinux-setup.c
@@
-30,11
+30,12
@@
#endif
#include "selinux-setup.h"
#endif
#include "selinux-setup.h"
+#include "selinux-util.h"
+#include "label.h"
#include "mount-setup.h"
#include "macro.h"
#include "util.h"
#include "log.h"
#include "mount-setup.h"
#include "macro.h"
#include "util.h"
#include "log.h"
-#include "label.h"
#ifdef HAVE_SELINUX
static int null_log(int type, const char *fmt, ...) {
#ifdef HAVE_SELINUX
static int null_log(int type, const char *fmt, ...) {
@@
-57,8
+58,12
@@
int selinux_setup(bool *loaded_policy) {
cb.func_log = null_log;
selinux_set_callback(SELINUX_CB_LOG, cb);
cb.func_log = null_log;
selinux_set_callback(SELINUX_CB_LOG, cb);
- /* Make sure getcon() works, which needs /proc and /sys */
- mount_setup_early();
+ /* Don't load policy in the initrd if we don't appear to have
+ * it. For the real root, we check below if we've already
+ * loaded policy, and return gracefully.
+ */
+ if (in_initrd() && access(selinux_path(), F_OK) < 0)
+ return 0;
/* Already initialized by somebody else? */
r = getcon_raw(&con);
/* Already initialized by somebody else? */
r = getcon_raw(&con);
@@
-79,12
+84,11
@@
int selinux_setup(bool *loaded_policy) {
/* Now load the policy */
before_load = now(CLOCK_MONOTONIC);
r = selinux_init_load_policy(&enforce);
/* Now load the policy */
before_load = now(CLOCK_MONOTONIC);
r = selinux_init_load_policy(&enforce);
-
if (r == 0) {
char timespan[FORMAT_TIMESPAN_MAX];
char *label;
if (r == 0) {
char timespan[FORMAT_TIMESPAN_MAX];
char *label;
-
label_
retest_selinux();
+ retest_selinux();
/* Transition to the new context */
r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);
/* Transition to the new context */
r = label_get_create_label_from_exe(SYSTEMD_BINARY_PATH, &label);
@@
-104,7
+108,7
@@
int selinux_setup(bool *loaded_policy) {
after_load = now(CLOCK_MONOTONIC);
log_info("Successfully loaded SELinux policy in %s.",
after_load = now(CLOCK_MONOTONIC);
log_info("Successfully loaded SELinux policy in %s.",
-
format_timespan(timespan, sizeof(timespan), after_load - before_load
));
+
format_timespan(timespan, sizeof(timespan), after_load - before_load, 0
));
*loaded_policy = true;
*loaded_policy = true;