X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=4c3ee7d5a2e240cd1ad42f1612a271f5dfa1146d;hb=c485d3ba094a0bf8d0165a4ba3eb5602cc21812a;hp=22052220f9105d235d8b44cdc0769b16e4c03f45;hpb=416693175bc317ef3fa4963af51a5ee077320d09;p=elogind.git diff --git a/src/core/main.c b/src/core/main.c index 22052220f..4c3ee7d5a 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -50,6 +50,7 @@ #include "watchdog.h" #include "path-util.h" #include "switch-root.h" +#include "capability.h" #include "mount-setup.h" #include "loopback-setup.h" @@ -77,6 +78,7 @@ static bool arg_crash_shell = false; static int arg_crash_chvt = -1; static bool arg_confirm_spawn = false; static bool arg_show_status = true; +static bool arg_switched_root = false; #ifdef HAVE_SYSV_COMPAT static bool arg_sysv_console = true; #endif @@ -86,6 +88,8 @@ static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL; static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT; static usec_t arg_runtime_watchdog = 0; static usec_t arg_shutdown_watchdog = 10 * USEC_PER_MINUTE; +static struct rlimit *arg_default_rlimit[RLIMIT_NLIMITS] = {}; +static uint64_t arg_capability_bounding_set_drop = 0; static FILE* serialization = NULL; @@ -228,11 +232,13 @@ static int set_default_unit(const char *u) { assert(u); - if (!(c = strdup(u))) + c = strdup(u); + if (!c) return -ENOMEM; free(arg_default_unit); arg_default_unit = c; + return 0; } @@ -254,10 +260,17 @@ static int parse_proc_cmdline_word(const char *word) { assert(word); - if (startswith(word, "systemd.unit=")) - return set_default_unit(word + 13); + if (startswith(word, "systemd.unit=")) { + + if (!in_initrd()) + return set_default_unit(word + 13); + + } else if (startswith(word, "rd.systemd.unit=")) { - else if (startswith(word, "systemd.log_target=")) { + if (in_initrd()) + return set_default_unit(word + 16); + + } else if (startswith(word, "systemd.log_target=")) { if (log_set_target_from_string(word + 19) < 0) log_warning("Failed to parse log target %s. Ignoring.", word + 19); @@ -366,6 +379,7 @@ static int parse_proc_cmdline_word(const char *word) { log_info("Supported kernel switches:\n" "systemd.unit=UNIT Default unit to start\n" + "rd.systemd.unit=UNIT Default unit to start when run in initrd\n" "systemd.dump_core=0|1 Dump core on crash\n" "systemd.crash_shell=0|1 Run shell on crash\n" "systemd.crash_chvt=N Change to VT #N on crash\n" @@ -666,6 +680,23 @@ static int parse_config_file(void) { { "Manager", "JoinControllers", config_parse_join_controllers, 0, &arg_join_controllers }, { "Manager", "RuntimeWatchdogSec", config_parse_usec, 0, &arg_runtime_watchdog }, { "Manager", "ShutdownWatchdogSec", config_parse_usec, 0, &arg_shutdown_watchdog }, + { "Manager", "CapabilityBoundingSet", config_parse_bounding_set, 0, &arg_capability_bounding_set_drop }, + { "Manager", "DefaultLimitCPU", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CPU]}, + { "Manager", "DefaultLimitFSIZE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_FSIZE]}, + { "Manager", "DefaultLimitDATA", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_DATA]}, + { "Manager", "DefaultLimitSTACK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_STACK]}, + { "Manager", "DefaultLimitCORE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_CORE]}, + { "Manager", "DefaultLimitRSS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RSS]}, + { "Manager", "DefaultLimitNOFILE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NOFILE]}, + { "Manager", "DefaultLimitAS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_AS]}, + { "Manager", "DefaultLimitNPROC", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NPROC]}, + { "Manager", "DefaultLimitMEMLOCK", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MEMLOCK]}, + { "Manager", "DefaultLimitLOCKS", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_LOCKS]}, + { "Manager", "DefaultLimitSIGPENDING",config_parse_limit, 0, &arg_default_rlimit[RLIMIT_SIGPENDING]}, + { "Manager", "DefaultLimitMSGQUEUE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_MSGQUEUE]}, + { "Manager", "DefaultLimitNICE", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_NICE]}, + { "Manager", "DefaultLimitRTPRIO", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTPRIO]}, + { "Manager", "DefaultLimitRTTIME", config_parse_limit, 0, &arg_default_rlimit[RLIMIT_RTTIME]}, { NULL, NULL, NULL, 0, NULL } }; @@ -747,7 +778,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_SHOW_STATUS, ARG_SYSV_CONSOLE, ARG_DESERIALIZE, - ARG_SWITCHEDROOT, + ARG_SWITCHED_ROOT, ARG_INTROSPECT, ARG_DEFAULT_STD_OUTPUT, ARG_DEFAULT_STD_ERROR @@ -772,7 +803,7 @@ static int parse_argv(int argc, char *argv[]) { { "sysv-console", optional_argument, NULL, ARG_SYSV_CONSOLE }, #endif { "deserialize", required_argument, NULL, ARG_DESERIALIZE }, - { "switchedroot", no_argument, NULL, ARG_SWITCHEDROOT }, + { "switched-root", no_argument, NULL, ARG_SWITCHED_ROOT }, { "introspect", optional_argument, NULL, ARG_INTROSPECT }, { "default-standard-output", required_argument, NULL, ARG_DEFAULT_STD_OUTPUT, }, { "default-standard-error", required_argument, NULL, ARG_DEFAULT_STD_ERROR, }, @@ -944,8 +975,8 @@ static int parse_argv(int argc, char *argv[]) { break; } - case ARG_SWITCHEDROOT: - /* Nothing special yet */ + case ARG_SWITCHED_ROOT: + arg_switched_root = true; break; case ARG_INTROSPECT: { @@ -1184,10 +1215,11 @@ int main(int argc, char *argv[]) { const char *shutdown_verb = NULL; dual_timestamp initrd_timestamp = { 0ULL, 0ULL }; static char systemd[] = "systemd"; - bool is_reexec = false; + bool skip_setup = false; int j; bool loaded_policy = false; bool arm_reboot_watchdog = false; + bool queue_default_job = false; char *switch_root_dir = NULL, *switch_root_init = NULL; #ifdef HAVE_SYSV_COMPAT @@ -1205,17 +1237,17 @@ int main(int argc, char *argv[]) { /* Determine if this is a reexecution or normal bootup. We do * the full command line parsing much later, so let's just * have a quick peek here. */ - for (j = 1; j < argc; j++) if (streq(argv[j], "--deserialize")) { - is_reexec = true; + skip_setup = true; break; } - /* If we have switched root, do all the special things */ + /* If we have switched root, do all the special setup + * things */ for (j = 1; j < argc; j++) - if (streq(argv[j], "--switchedroot")) { - is_reexec = false; + if (streq(argv[j], "--switched-root")) { + skip_setup = false; break; } @@ -1250,7 +1282,7 @@ int main(int argc, char *argv[]) { arg_running_as = MANAGER_SYSTEM; log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG); - if (!is_reexec) { + if (!skip_setup) { if (selinux_setup(&loaded_policy) < 0) goto finish; if (ima_setup() < 0) @@ -1262,7 +1294,7 @@ int main(int argc, char *argv[]) { if (label_init(NULL) < 0) goto finish; - if (!is_reexec) + if (!skip_setup) if (hwclock_is_localtime() > 0) { int min; @@ -1374,7 +1406,7 @@ int main(int argc, char *argv[]) { /* Parse the data passed to us. We leave this * variables set, but the manager later on will not * pass them on to our children. */ - if(!in_initrd()) + if (!in_initrd()) parse_initrd_timestamp(&initrd_timestamp); /* Unset some environment variables passed in from the @@ -1388,7 +1420,7 @@ int main(int argc, char *argv[]) { unsetenv("SHLVL"); unsetenv("_"); - /* When we are invoked by a tool chroot-like such as + /* When we are invoked by a chroot-like tool such as * nspawn, these might be set, but make little sense * to pass on */ unsetenv("USER"); @@ -1415,7 +1447,7 @@ int main(int argc, char *argv[]) { /* Reset the console, but only if this is really init and we * are freshly booted */ if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN) { - console_setup(getpid() == 1 && !is_reexec); + console_setup(getpid() == 1 && !skip_setup); make_null_stdio(); } @@ -1436,7 +1468,7 @@ int main(int argc, char *argv[]) { log_full(arg_running_as == MANAGER_SYSTEM ? LOG_INFO : LOG_DEBUG, PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES "; " DISTRIBUTION ")", manager_running_as_to_string(arg_running_as)); - if (arg_running_as == MANAGER_SYSTEM && !is_reexec) { + if (arg_running_as == MANAGER_SYSTEM && !skip_setup) { locale_setup(); if (arg_show_status || plymouth_running()) @@ -1455,6 +1487,19 @@ int main(int argc, char *argv[]) { if (arg_running_as == MANAGER_SYSTEM && arg_runtime_watchdog > 0) watchdog_set_timeout(&arg_runtime_watchdog); + if (arg_capability_bounding_set_drop) { + r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true); + if (r < 0) { + log_error("Failed to drop capability bounding set: %s", strerror(-r)); + goto finish; + } + r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop); + if (r < 0) { + log_error("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r)); + goto finish; + } + } + r = manager_new(arg_running_as, &m); if (r < 0) { log_error("Failed to allocate manager object: %s", strerror(-r)); @@ -1470,6 +1515,8 @@ int main(int argc, char *argv[]) { m->runtime_watchdog = arg_runtime_watchdog; m->shutdown_watchdog = arg_shutdown_watchdog; + manager_set_default_rlimits(m, arg_default_rlimit); + if (dual_timestamp_is_set(&initrd_timestamp)) m->initrd_timestamp = initrd_timestamp; @@ -1478,16 +1525,18 @@ int main(int argc, char *argv[]) { manager_set_show_status(m, arg_show_status); + /* Remember whether we should queue the default job */ + queue_default_job = !serialization || arg_switched_root; + before_startup = now(CLOCK_MONOTONIC); r = manager_startup(m, serialization, fds); if (r < 0) log_error("Failed to fully start up daemon: %s", strerror(-r)); + /* This will close all file descriptors that were opened, but + * not claimed by any unit. */ if (fds) { - /* This will close all file descriptors that were opened, but - * not claimed by any unit. */ - fdset_free(fds); fds = NULL; } @@ -1495,7 +1544,9 @@ int main(int argc, char *argv[]) { if (serialization) { fclose(serialization); serialization = NULL; - } else { + } + + if (queue_default_job) { DBusError error; Unit *target = NULL; Job *default_unit_job; @@ -1629,6 +1680,9 @@ finish: if (m) manager_free(m); + for (j = 0; j < RLIMIT_NLIMITS; j++) + free (arg_default_rlimit[j]); + free(arg_default_unit); strv_free(arg_default_controllers); free_join_controllers(); @@ -1671,7 +1725,7 @@ finish: i = 0; args[i++] = SYSTEMD_BINARY_PATH; if (switch_root_dir) - args[i++] = "--switchedroot"; + args[i++] = "--switched-root"; args[i++] = arg_running_as == MANAGER_SYSTEM ? "--system" : "--user"; args[i++] = "--deserialize"; args[i++] = sfd; @@ -1711,12 +1765,15 @@ finish: args[0] = "/sbin/init"; execv(args[0], (char* const*) args); - log_warning("Failed to execute /sbin/init, trying fallback: %m"); + if (errno == ENOENT) { + log_warning("No /sbin/init, trying fallback"); - args[0] = "/bin/sh"; - args[1] = NULL; - execv(args[0], (char* const*) args); - log_error("Failed to execute /bin/sh, giving up: %m"); + args[0] = "/bin/sh"; + args[1] = NULL; + execv(args[0], (char* const*) args); + log_error("Failed to execute /bin/sh, giving up: %m"); + } else + log_warning("Failed to execute /sbin/init, giving up: %m"); } if (serialization)