_exit(1);
}
- log_info("Successfully spawned crash shall as pid %lu.", (unsigned long) pid);
+ log_info("Successfully spawned crash shell as pid %lu.", (unsigned long) pid);
}
log_info("Freezing execution.");
return -tty_fd;
}
- if ((r = reset_terminal(tty_fd)) < 0)
+ if ((r = reset_terminal_fd(tty_fd)) < 0)
log_error("Failed to reset /dev/console: %s", strerror(-r));
close_nointr_nofail(tty_fd);
assert(_f);
assert(_fds);
+ /* Make sure nothing is really destructed when we shut down */
+ m->n_reloading ++;
+
if ((r = manager_open_serialization(m, &f)) < 0) {
log_error("Failed to create serialization file: %s", strerror(-r));
goto fail;
if (dir_is_empty("/usr") <= 0)
return;
- log_warning("/usr appears to be on a different file system than /. This is not supported anymore. "
+ log_warning("/usr appears to be on its own filesytem and is not already mounted. This is not a supported setup. "
"Some things will probably break (sometimes even silently) in mysterious ways. "
"Consult http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken for more information.");
}
program_invocation_short_name = systemd;
prctl(PR_SET_NAME, systemd);
+ saved_argv = argv;
+ saved_argc = argc;
log_show_color(isatty(STDERR_FILENO) > 0);
log_show_location(false);
if (label_init() < 0)
goto finish;
+
+ if (hwclock_is_localtime() > 0) {
+ int min;
+
+ min = hwclock_apply_localtime_delta();
+ if (min < 0)
+ log_error("Failed to apply local time delta: %s", strerror(-min));
+ else
+ log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
+ }
} else {
arg_running_as = MANAGER_USER;
- log_set_target(LOG_TARGET_CONSOLE);
+ log_set_target(LOG_TARGET_AUTO);
}
if (set_default_unit(SPECIAL_DEFAULT_TARGET) < 0)
goto finish;
}
- /* If Plymouth is being run make sure we show the status, so
- * that there's something nice to see when people press Esc */
- if (access("/run/initramfs/plymouth", F_OK) >= 0)
- arg_show_status = true;
-
if (arg_action == ACTION_HELP) {
retval = help();
goto finish;
if (arg_running_as == MANAGER_SYSTEM && !serialization) {
locale_setup();
- if (arg_show_status)
+ if (arg_show_status || plymouth_running())
status_welcome();
kmod_setup();