static bool confirm_spawn = false;
static FILE* serialization = NULL;
-_noreturn static void freeze(void) {
+_noreturn_ static void freeze(void) {
for (;;)
pause();
}
static void nop_handler(int sig) {
}
-_noreturn static void crash(int sig) {
+_noreturn_ static void crash(int sig) {
if (!dump_core)
log_error("Caught <%s>, not dumping core.", strsignal(sig));
"5", SPECIAL_RUNLEVEL5_TARGET
};
- if (startswith(word, "systemd.default="))
- return set_default_unit(word + 16);
+ if (startswith(word, "systemd.unit="))
+ return set_default_unit(word + 13);
else if (startswith(word, "systemd.log_target=")) {
log_warning("Unknown kernel switch %s. Ignoring.", word);
log_info("Supported kernel switches:");
- log_info("systemd.default=UNIT Default unit to start");
+ log_info("systemd.default_unit=UNIT Default unit to start");
log_info("systemd.log_target=console|kmsg|syslog Log target");
log_info("systemd.log_level=LEVEL Log level");
log_info("systemd.dump_core=0|1 Dump core on crash");
enum {
ARG_LOG_LEVEL = 0x100,
ARG_LOG_TARGET,
- ARG_DEFAULT,
+ ARG_UNIT,
ARG_RUNNING_AS,
ARG_TEST,
ARG_DUMP_CONFIGURATION_ITEMS,
static const struct option options[] = {
{ "log-level", required_argument, NULL, ARG_LOG_LEVEL },
{ "log-target", required_argument, NULL, ARG_LOG_TARGET },
- { "default", required_argument, NULL, ARG_DEFAULT },
+ { "unit", required_argument, NULL, ARG_UNIT },
{ "running-as", required_argument, NULL, ARG_RUNNING_AS },
{ "test", no_argument, NULL, ARG_TEST },
{ "help", no_argument, NULL, 'h' },
break;
- case ARG_DEFAULT:
+ case ARG_UNIT:
if ((r = set_default_unit(optarg)) < 0) {
log_error("Failed to set default unit %s: %s", optarg, strerror(-r));
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
- if (mount_setup() < 0)
- goto finish;
+ if (geteuid() == 0)
+ if (mount_setup() < 0)
+ goto finish;
/* Reset all signal handlers. */
assert_se(reset_all_signal_handlers() == 0);