#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"
sigaction_many(&sa, SIGNALS_CRASH_HANDLER, -1);
}
-static int make_null_stdio(void) {
- int null_fd, r;
-
- if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0) {
- log_error("Failed to open /dev/null: %m");
- return -errno;
- }
-
- if ((r = make_stdio(null_fd)) < 0)
- log_warning("Failed to dup2() device: %s", strerror(-r));
-
- return r;
-}
-
static int console_setup(bool do_reset) {
int tty_fd, r;
#ifdef HAVE_SYSV_COMPAT
"systemd.sysv_console=0|1 Connect output of SysV scripts to console\n"
#endif
- "systemd.log_target=console|kmsg|syslog|syslog-org-kmsg|null\n"
+ "systemd.log_target=console|kmsg|syslog|syslog-or-kmsg|null\n"
" Log target\n"
"systemd.log_level=LEVEL Log level\n"
"systemd.log_color=0|1 Highlight important log messages\n"
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 {
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
arg_running_as == MANAGER_SYSTEM);
+ /* Unset some environment variables passed in from the kernel
+ * that don't really make sense for us. */
+ if (arg_running_as == MANAGER_SYSTEM) {
+ unsetenv("HOME");
+ unsetenv("TERM");
+ }
+
/* Move out of the way, so that we won't block unmounts */
assert_se(chdir("/") == 0);