#include "capability.h"
#include "killall.h"
#include "env-util.h"
-#include "hwclock.h"
+#include "clock-util.h"
#include "fileio.h"
#include "dbus-manager.h"
#include "bus-error.h"
static usec_t arg_runtime_watchdog = 0;
static usec_t arg_shutdown_watchdog = 10 * USEC_PER_MINUTE;
static char **arg_default_environment = NULL;
-static struct rlimit *arg_default_rlimit[RLIMIT_NLIMITS] = {};
+static struct rlimit *arg_default_rlimit[_RLIMIT_MAX] = {};
static uint64_t arg_capability_bounding_set_drop = 0;
static nsec_t arg_timer_slack_nsec = (nsec_t) -1;
+static usec_t arg_default_timer_accuracy_usec = 1 * USEC_PER_MINUTE;
static Set* arg_syscall_archs = NULL;
static FILE* arg_serialization = NULL;
static bool arg_default_cpu_accounting = false;
if (r < 0)
log_error("Failed to reset /dev/console: %s", strerror(-r));
- close_nointr_nofail(tty_fd);
+ safe_close(tty_fd);
return r;
}
return 0;
}
-static int parse_proc_cmdline_word(const char *word) {
+static int parse_proc_cmdline_item(const char *key, const char *value) {
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
"4", SPECIAL_RUNLEVEL4_TARGET,
"5", SPECIAL_RUNLEVEL5_TARGET,
};
+ int r;
- assert(word);
+ assert(key);
- if (startswith(word, "systemd.unit=")) {
+ if (streq(key, "systemd.unit") && value) {
if (!in_initrd())
- return set_default_unit(word + 13);
+ return set_default_unit(value);
- } else if (startswith(word, "rd.systemd.unit=")) {
+ } else if (streq(key, "rd.systemd.unit") && value) {
- if (in_initrd())
- return set_default_unit(word + 16);
+ return set_default_unit(value);
- } else if (startswith(word, "systemd.log_target=")) {
+ } else if (streq(key, "systemd.log_target") && value) {
- if (log_set_target_from_string(word + 19) < 0)
- log_warning("Failed to parse log target %s. Ignoring.", word + 19);
+ if (log_set_target_from_string(value) < 0)
+ log_warning("Failed to parse log target %s. Ignoring.", value);
- } else if (startswith(word, "systemd.log_level=")) {
+ } else if (streq(key, "systemd.log_level") && value) {
- if (log_set_max_level_from_string(word + 18) < 0)
- log_warning("Failed to parse log level %s. Ignoring.", word + 18);
+ if (log_set_max_level_from_string(value) < 0)
+ log_warning("Failed to parse log level %s. Ignoring.", value);
- } else if (startswith(word, "systemd.log_color=")) {
+ } else if (streq(key, "systemd.log_color") && value) {
- if (log_show_color_from_string(word + 18) < 0)
- log_warning("Failed to parse log color setting %s. Ignoring.", word + 18);
+ if (log_show_color_from_string(value) < 0)
+ log_warning("Failed to parse log color setting %s. Ignoring.", value);
- } else if (startswith(word, "systemd.log_location=")) {
+ } else if (streq(key, "systemd.log_location") && value) {
- if (log_show_location_from_string(word + 21) < 0)
- log_warning("Failed to parse log location setting %s. Ignoring.", word + 21);
+ if (log_show_location_from_string(value) < 0)
+ log_warning("Failed to parse log location setting %s. Ignoring.", value);
- } else if (startswith(word, "systemd.dump_core=")) {
- int r;
+ } else if (streq(key, "systemd.dump_core") && value) {
- r = parse_boolean(word + 18);
+ r = parse_boolean(value);
if (r < 0)
- log_warning("Failed to parse dump core switch %s. Ignoring.", word + 18);
+ log_warning("Failed to parse dump core switch %s. Ignoring.", value);
else
arg_dump_core = r;
- } else if (startswith(word, "systemd.crash_shell=")) {
- int r;
+ } else if (streq(key, "systemd.crash_shell") && value) {
- r = parse_boolean(word + 20);
+ r = parse_boolean(value);
if (r < 0)
- log_warning("Failed to parse crash shell switch %s. Ignoring.", word + 20);
+ log_warning("Failed to parse crash shell switch %s. Ignoring.", value);
else
arg_crash_shell = r;
- } else if (startswith(word, "systemd.confirm_spawn=")) {
- int r;
+ } else if (streq(key, "systemd.crash_chvt") && value) {
- r = parse_boolean(word + 22);
- if (r < 0)
- log_warning("Failed to parse confirm spawn switch %s. Ignoring.", word + 22);
+ if (safe_atoi(value, &r) < 0)
+ log_warning("Failed to parse crash chvt switch %s. Ignoring.", value);
else
- arg_confirm_spawn = r;
+ arg_crash_chvt = r;
- } else if (startswith(word, "systemd.crash_chvt=")) {
- int k;
+ } else if (streq(key, "systemd.confirm_spawn") && value) {
- if (safe_atoi(word + 19, &k) < 0)
- log_warning("Failed to parse crash chvt switch %s. Ignoring.", word + 19);
+ r = parse_boolean(value);
+ if (r < 0)
+ log_warning("Failed to parse confirm spawn switch %s. Ignoring.", value);
else
- arg_crash_chvt = k;
+ arg_confirm_spawn = r;
- } else if (startswith(word, "systemd.show_status=")) {
- int r;
+ } else if (streq(key, "systemd.show_status") && value) {
- r = parse_show_status(word + 20, &arg_show_status);
+ r = parse_show_status(value, &arg_show_status);
if (r < 0)
- log_warning("Failed to parse show status switch %s. Ignoring.", word + 20);
- } else if (startswith(word, "systemd.default_standard_output=")) {
- int r;
+ log_warning("Failed to parse show status switch %s. Ignoring.", value);
+
+ } else if (streq(key, "systemd.default_standard_output") && value) {
- r = exec_output_from_string(word + 32);
+ r = exec_output_from_string(value);
if (r < 0)
- log_warning("Failed to parse default standard output switch %s. Ignoring.", word + 32);
+ log_warning("Failed to parse default standard output switch %s. Ignoring.", value);
else
arg_default_std_output = r;
- } else if (startswith(word, "systemd.default_standard_error=")) {
- int r;
- r = exec_output_from_string(word + 31);
+ } else if (streq(key, "systemd.default_standard_error") && value) {
+
+ r = exec_output_from_string(value);
if (r < 0)
- log_warning("Failed to parse default standard error switch %s. Ignoring.", word + 31);
+ log_warning("Failed to parse default standard error switch %s. Ignoring.", value);
else
arg_default_std_error = r;
- } else if (startswith(word, "systemd.setenv=")) {
- const char *cenv = word + 15;
- if (env_assignment_is_valid(cenv)) {
+ } else if (streq(key, "systemd.setenv") && value) {
+
+ if (env_assignment_is_valid(value)) {
char **env;
- env = strv_env_set(arg_default_environment, cenv);
+ env = strv_env_set(arg_default_environment, value);
if (env)
arg_default_environment = env;
else
- log_warning("Setting environment variable '%s' failed, ignoring: %s",
- cenv, strerror(ENOMEM));
+ log_warning("Setting environment variable '%s' failed, ignoring: %s", value, strerror(ENOMEM));
} else
- log_warning("Environment variable name '%s' is not valid. Ignoring.", cenv);
+ log_warning("Environment variable name '%s' is not valid. Ignoring.", value);
- } else if (startswith(word, "systemd.") ||
- (in_initrd() && startswith(word, "rd.systemd."))) {
+ } else if (!streq(key, "systemd.restore_state") &&
+ !streq(key, "systemd.gpt_auto") &&
+ (startswith(key, "systemd.") || startswith(key, "rd.systemd."))) {
const char *c;
/* Ignore systemd.journald.xyz and friends */
- c = word;
+ c = key;
if (startswith(c, "rd."))
c += 3;
if (startswith(c, "systemd."))
c += 8;
if (c[strcspn(c, ".=")] != '.') {
- log_warning("Unknown kernel switch %s. Ignoring.", word);
+ log_warning("Unknown kernel switch %s. Ignoring.", key);
log_info("Supported kernel switches:\n"
"systemd.unit=UNIT Default unit to start\n"
" Set default log output for services\n"
"systemd.default_standard_error=null|tty|syslog|syslog+console|kmsg|kmsg+console|journal|journal+console\n"
" Set default log error output for services\n"
- "systemd.setenv=ASSIGNMENT Set an environment variable for all spawned processes\n");
+ "systemd.setenv=ASSIGNMENT Set an environment variable for all spawned processes\n"
+ "systemd.restore_state=0|1 Restore backlight/rfkill state at boot\n");
}
- } else if (streq(word, "quiet")) {
+ } else if (streq(key, "quiet") && !value) {
if (arg_show_status == _SHOW_STATUS_UNSET)
arg_show_status = SHOW_STATUS_AUTO;
- } else if (streq(word, "debug")) {
- /* Log to kmsg, the journal socket will fill up before the
- * journal is started and tools running during that time
- * will block with every log message for for 60 seconds,
- * before they give up. */
+
+ } else if (streq(key, "debug") && !value) {
log_set_max_level(LOG_DEBUG);
- log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG);
- } else if (!in_initrd()) {
+ if (detect_container(NULL) > 0)
+ log_set_target(LOG_TARGET_CONSOLE);
+
+ } else if (!in_initrd() && !value) {
unsigned i;
/* SysV compatibility */
for (i = 0; i < ELEMENTSOF(rlmap); i += 2)
- if (streq(word, rlmap[i]))
+ if (streq(key, rlmap[i]))
return set_default_unit(rlmap[i+1]);
}
DEFINE_SETTER(config_parse_color, log_show_color_from_string, "color" )
DEFINE_SETTER(config_parse_location, log_show_location_from_string, "location")
-static int config_parse_cpu_affinity2(const char *unit,
- const char *filename,
- unsigned line,
- const char *section,
- unsigned section_line,
- const char *lvalue,
- int ltype,
- const char *rvalue,
- void *data,
- void *userdata) {
+static int config_parse_cpu_affinity2(
+ const char *unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
char *w;
size_t l;
return 0;
}
+static int config_parse_show_status(
+ const char* unit,
+ const char *filename,
+ unsigned line,
+ const char *section,
+ unsigned section_line,
+ const char *lvalue,
+ int ltype,
+ const char *rvalue,
+ void *data,
+ void *userdata) {
+
+ int k;
+ ShowStatus *b = data;
+
+ assert(filename);
+ assert(lvalue);
+ assert(rvalue);
+ assert(data);
+
+ k = parse_show_status(rvalue, b);
+ if (k < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, -k,
+ "Failed to parse show status setting, ignoring: %s", rvalue);
+ return 0;
+ }
+
+ return 0;
+}
+
static void strv_free_free(char ***l) {
char ***i;
{ "Manager", "SystemCallArchitectures", config_parse_syscall_archs, 0, &arg_syscall_archs },
#endif
{ "Manager", "TimerSlackNSec", config_parse_nsec, 0, &arg_timer_slack_nsec },
+ { "Manager", "DefaultTimerAccuracySec", config_parse_sec, 0, &arg_default_timer_accuracy_usec },
{ "Manager", "DefaultStandardOutput", config_parse_output, 0, &arg_default_std_output },
{ "Manager", "DefaultStandardError", config_parse_output, 0, &arg_default_std_error },
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
* instead. */
for (a = argv; a < argv + argc; a++) {
- r = parse_proc_cmdline_word(*a);
+ _cleanup_free_ char *w;
+ char *value;
+
+ w = strdup(*a);
+ if (!w)
+ return log_oom();
+
+ value = strchr(w, '=');
+ if (value)
+ *(value++) = 0;
+
+ r = parse_proc_cmdline_item(w, value);
if (r < 0) {
log_error("Failed on cmdline argument %s: %s", *a, strerror(-r));
return r;
"Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
}
-static void test_cgroups(void) {
-
- if (access("/proc/cgroups", F_OK) >= 0)
- return;
-
- log_warning("CONFIG_CGROUPS was not set when your kernel was compiled. "
- "Systems without control groups are not supported. "
- "We will now sleep for 10s, and then continue boot-up. "
- "Expect breakage and please do not file bugs. "
- "Instead fix your kernel and enable CONFIG_CGROUPS. "
- "Consult http://0pointer.de/blog/projects/cgroups-vs-cgroups.html for more information.");
-
- sleep(10);
-}
-
static int initialize_join_controllers(void) {
/* By default, mount "cpu" + "cpuacct" together, and "net_cls"
* + "net_prio". We'd like to add "cpuset" to the mix, but
goto finish;
if (!skip_setup) {
- if (hwclock_is_localtime() > 0) {
+ if (clock_is_localtime() > 0) {
int min;
/* The first-time call to settimeofday() does a time warp in the kernel */
- r = hwclock_set_timezone(&min);
+ r = clock_set_timezone(&min);
if (r < 0)
log_error("Failed to apply local time delta, ignoring: %s", strerror(-r));
else
* that way. In such case, we need to delay the time-warp or the sealing
* until we reach the real system.
*/
- hwclock_reset_timezone();
+ clock_reset_timezone();
/* Tell the kernel our timezone */
- r = hwclock_set_timezone(NULL);
+ r = clock_set_timezone(NULL);
if (r < 0)
log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r));
}
goto finish;
if (arg_running_as == SYSTEMD_SYSTEM)
- if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
+ if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
goto finish;
log_parse_environment();
kmod_setup();
#endif
hostname_setup();
- machine_id_setup();
+ machine_id_setup("");
loopback_setup();
test_mtab();
test_usr();
- test_cgroups();
}
if (arg_running_as == SYSTEMD_SYSTEM && arg_runtime_watchdog > 0)
}
m->confirm_spawn = arg_confirm_spawn;
+ m->default_timer_accuracy_usec = arg_default_timer_accuracy_usec;
m->default_std_output = arg_default_std_output;
m->default_std_error = arg_default_std_error;
m->default_restart_usec = arg_default_restart_usec;
if (log_get_show_location())
command_line[pos++] = "--log-location";
- assert(pos + 1 < ELEMENTSOF(command_line));
+ assert(pos < ELEMENTSOF(command_line));
if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) {
char *e;
~ianmdlvl / elogind.git / blobdiff