#include "mount-setup.h"
#include "hostname-setup.h"
#include "loopback-setup.h"
+#include "kmod-setup.h"
#include "load-fragment.h"
#include "fdset.h"
+#include "special.h"
static enum {
ACTION_RUN,
ACTION_HELP,
ACTION_TEST,
- ACTION_DUMP_CONFIGURATION_ITEMS
+ ACTION_DUMP_CONFIGURATION_ITEMS,
+ ACTION_DONE
} action = ACTION_RUN;
static char *default_unit = NULL;
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));
else if (pid == 0) {
int fd, r;
- if ((fd = acquire_terminal("/dev/console", false, true)) < 0) {
+ if ((fd = acquire_terminal("/dev/console", false, true, true)) < 0)
log_error("Failed to acquire terminal: %s", strerror(-fd));
- _exit(1);
- }
-
- if ((r = make_stdio(fd)) < 0) {
+ else if ((r = make_stdio(fd)) < 0)
log_error("Failed to duplicate terminal fd: %s", strerror(-r));
- _exit(1);
- }
execl("/bin/sh", "/bin/sh", NULL);
sa.sa_handler = crash;
sa.sa_flags = SA_NODEFER;
- assert_se(sigaction(SIGSEGV, &sa, NULL) == 0);
- assert_se(sigaction(SIGILL, &sa, NULL) == 0);
- assert_se(sigaction(SIGFPE, &sa, NULL) == 0);
- assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
- assert_se(sigaction(SIGQUIT, &sa, NULL) == 0);
- assert_se(sigaction(SIGABRT, &sa, NULL) == 0);
+ 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)) < 0) {
+ if ((null_fd = open("/dev/null", O_RDWR|O_NOCTTY)) < 0) {
log_error("Failed to open /dev/null: %m");
return -errno;
}
static int parse_proc_cmdline_word(const char *word) {
static const char * const rlmap[] = {
- "single", SPECIAL_RUNLEVEL1_TARGET,
- "-s", SPECIAL_RUNLEVEL1_TARGET,
- "s", SPECIAL_RUNLEVEL1_TARGET,
- "S", SPECIAL_RUNLEVEL1_TARGET,
- "1", SPECIAL_RUNLEVEL1_TARGET,
+ "single", SPECIAL_RESCUE_TARGET,
+ "-s", SPECIAL_RESCUE_TARGET,
+ "s", SPECIAL_RESCUE_TARGET,
+ "S", SPECIAL_RESCUE_TARGET,
+ "1", SPECIAL_RESCUE_TARGET,
"2", SPECIAL_RUNLEVEL2_TARGET,
"3", SPECIAL_RUNLEVEL3_TARGET,
"4", SPECIAL_RUNLEVEL4_TARGET,
"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=")) {
if (log_set_max_level_from_string(word + 18) < 0)
log_warning("Failed to parse log level %s. Ignoring.", word + 18);
+ } else if (startswith(word, "systemd.log_color=")) {
+
+ if (log_show_color_from_string(word + 18) < 0)
+ log_warning("Failed to parse log color setting %s. Ignoring.", word + 18);
+
+ } else if (startswith(word, "systemd.log_location=")) {
+
+ if (log_show_location_from_string(word + 21) < 0)
+ log_warning("Failed to parse log location setting %s. Ignoring.", word + 21);
+
} else if (startswith(word, "systemd.dump_core=")) {
int r;
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.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");
- log_info("systemd.crash_shell=0|1 On crash run shell");
- log_info("systemd.crash_chvt=N Change to VT #N on crash");
- log_info("systemd.confirm_spawn=0|1 Confirm every process spawn");
+ log_info("Supported kernel switches:\n"
+ "systemd.unit=UNIT Default unit to start\n"
+ "systemd.log_target=console|kmsg|syslog| Log target\n"
+ " syslog-org-kmsg|null\n"
+ "systemd.log_level=LEVEL Log level\n"
+ "systemd.log_color=0|1 Highlight important log messages\n"
+ "systemd.log_location=0|1 Include code location in log messages\n"
+ "systemd.dump_core=0|1 Dump core on crash\n"
+ "systemd.crash_shell=0|1 On crash run shell\n"
+ "systemd.crash_chvt=N Change to VT #N on crash\n"
+ "systemd.confirm_spawn=0|1 Confirm every process spawn");
} else {
unsigned i;
enum {
ARG_LOG_LEVEL = 0x100,
ARG_LOG_TARGET,
- ARG_DEFAULT,
+ ARG_LOG_COLOR,
+ ARG_LOG_LOCATION,
+ ARG_UNIT,
ARG_RUNNING_AS,
ARG_TEST,
ARG_DUMP_CONFIGURATION_ITEMS,
ARG_CONFIRM_SPAWN,
- ARG_DESERIALIZE
+ ARG_DESERIALIZE,
+ ARG_INTROSPECT
};
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 },
+ { "log-color", optional_argument, NULL, ARG_LOG_COLOR },
+ { "log-location", optional_argument, NULL, ARG_LOG_LOCATION },
+ { "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' },
{ "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS },
{ "confirm-spawn", no_argument, NULL, ARG_CONFIRM_SPAWN },
{ "deserialize", required_argument, NULL, ARG_DESERIALIZE },
+ { "introspect", optional_argument, NULL, ARG_INTROSPECT },
{ NULL, 0, NULL, 0 }
};
break;
- case ARG_DEFAULT:
+ case ARG_LOG_COLOR:
+
+ if ((r = log_show_color_from_string(optarg)) < 0) {
+ log_error("Failed to parse log color setting %s.", optarg);
+ return r;
+ }
+
+ break;
+
+ case ARG_LOG_LOCATION:
+
+ if ((r = log_show_location_from_string(optarg)) < 0) {
+ log_error("Failed to parse log location setting %s.", optarg);
+ return r;
+ }
+
+ break;
+
+ case ARG_UNIT:
if ((r = set_default_unit(optarg)) < 0) {
log_error("Failed to set default unit %s: %s", optarg, strerror(-r));
break;
}
+ case ARG_INTROSPECT: {
+ const char * const * i = NULL;
+
+ for (i = bus_interface_table; *i; i += 2)
+ if (!optarg || streq(i[0], optarg)) {
+ fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
+ "<node>\n", stdout);
+ fputs(i[1], stdout);
+ fputs("</node>\n", stdout);
+
+ if (optarg)
+ break;
+ }
+
+ if (!i[0] && optarg)
+ log_error("Unknown interface %s.", optarg);
+
+ action = ACTION_DONE;
+ break;
+ }
+
case 'h':
action = ACTION_HELP;
break;
static int help(void) {
printf("%s [options]\n\n"
+ "Starts up and maintains the system or a session.\n\n"
" -h --help Show this help\n"
- " --default=UNIT Set default unit\n"
- " --log-level=LEVEL Set log level\n"
- " --log-target=TARGET Set log target (console, syslog, kmsg, syslog-or-kmsg)\n"
+ " --unit=UNIT Set default unit\n"
" --running-as=AS Set running as (init, system, session)\n"
" --test Determine startup sequence, dump it and exit\n"
" --dump-configuration-items Dump understood unit configuration items\n"
- " --confirm-spawn Ask for confirmation when spawning processes\n",
- __progname);
+ " --confirm-spawn Ask for confirmation when spawning processes\n"
+ " --introspect[=INTERFACE] Extract D-Bus interface data\n"
+ " --log-level=LEVEL Set log level\n"
+ " --log-target=TARGET Set log target (console, syslog, kmsg, syslog-or-kmsg, null)\n"
+ " --log-color[=0|1] Highlight import log messages\n"
+ " --log-location[=0|1] Include code location in log messages\n",
+ program_invocation_short_name);
return 0;
}
FDSet *fds = NULL;
bool reexecute = false;
+ if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
+ /* This is compatbility support for SysV, where
+ * calling init as a user is identical to telinit. */
+
+ errno = -ENOENT;
+ execv(SYSTEMCTL_BINARY_PATH, argv);
+ log_error("Failed to exec " SYSTEMCTL_BINARY_PATH ": %m");
+ return 1;
+ }
+
+ log_show_color(true);
+ log_show_location(false);
+ log_set_max_level(LOG_DEBUG);
+
if (getpid() == 1) {
running_as = MANAGER_INIT;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
- } else
+ } else {
running_as = MANAGER_SESSION;
+ log_set_target(LOG_TARGET_CONSOLE);
+ }
if (set_default_unit(SPECIAL_DEFAULT_TARGET) < 0)
goto finish;
/* 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);
/* If we are init, we can block sigkill. Yay. */
- ignore_signal(SIGKILL);
- ignore_signal(SIGPIPE);
+ ignore_signals(SIGNALS_IGNORE, -1);
if (running_as != MANAGER_SESSION)
if (parse_proc_cmdline() < 0)
unit_dump_config_items(stdout);
retval = 0;
goto finish;
+ } else if (action == ACTION_DONE) {
+ retval = 0;
+ goto finish;
}
assert_se(action == ACTION_RUN || action == ACTION_TEST);
log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as));
if (running_as == MANAGER_INIT) {
+ kmod_setup();
hostname_setup();
loopback_setup();
}