shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-20 14:03:39 +03:00
Code

manager: print fatal errors on the console too

Browse Source 
When booting in quiet mode, fatal messages would not be shown at all to the user.

https://bugzilla.redhat.com/show_bug.cgi?id=1155468

(cherry-picked from cb6531bee6e6f66c3a9d85b24fed68fae7fad6ad)
This commit is contained in:
Fedora systemd team 2015-01-06 12:22:52 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 17269303a0
commit 51b172bbcd
3 changed files with 54 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/core/main.c
View File

@ -1235,6 +1235,7 @@ int main(int argc, char *argv[]) {
bool empty_etc = false;
char *switch_root_dir = NULL, *switch_root_init = NULL;
static struct rlimit saved_rlimit_nofile = { 0, 0 };
const char *error_message = NULL;
#ifdef HAVE_SYSV_COMPAT
if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
@ -1293,17 +1294,23 @@ int main(int argc, char *argv[]) {
if (!skip_setup) {
mount_setup_early();
dual_timestamp_get(&security_start_timestamp);
if (mac_selinux_setup(&loaded_policy) < 0)
if (mac_selinux_setup(&loaded_policy) < 0) {
error_message = "Failed to load SELinux policy";
goto finish;
if (ima_setup() < 0)
} else if (ima_setup() < 0) {
error_message = "Failed to load IMA policy";
goto finish;
if (mac_smack_setup(&loaded_policy) < 0)
} else if (mac_smack_setup(&loaded_policy) < 0) {
error_message = "Failed to load SMACK policy";
goto finish;
}
dual_timestamp_get(&security_finish_timestamp);
}
if (mac_selinux_init(NULL) < 0)
if (mac_selinux_init(NULL) < 0) {
error_message = "Failed to initialize SELinux policy";
goto finish;
}
if (!skip_setup) {
if (clock_is_localtime() > 0) {
@ -1379,19 +1386,23 @@ int main(int argc, char *argv[]) {
r = set_default_unit(SPECIAL_DEFAULT_TARGET);
if (r < 0) {
log_error("Failed to set default unit %s: %s", SPECIAL_DEFAULT_TARGET, strerror(-r));
error_message = "Failed to set default unit";
goto finish;
}
r = initialize_join_controllers();
if (r < 0)
if (r < 0) {
error_message = "Failed to initalize cgroup controllers";
goto finish;
}
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid() == 1) {
r = mount_setup(loaded_policy);
if (r < 0)
if (r < 0) {
error_message = "Failed to mount API filesystems";
goto finish;
}
}
/* Reset all signal handlers. */
@ -1399,8 +1410,10 @@ int main(int argc, char *argv[]) {
ignore_signals(SIGNALS_IGNORE, -1);
if (parse_config_file() < 0)
if (parse_config_file() < 0) {
error_message = "Failed to parse config file";
goto finish;
}
if (arg_running_as == SYSTEMD_SYSTEM)
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
@ -1410,8 +1423,10 @@ int main(int argc, char *argv[]) {
* line, including "debug". */
log_parse_environment();
if (parse_argv(argc, argv) < 0)
if (parse_argv(argc, argv) < 0) {
error_message = "Failed to parse commandline arguments";
goto finish;
}
if (arg_action == ACTION_TEST &&
geteuid() == 0) {
@ -1468,6 +1483,7 @@ int main(int argc, char *argv[]) {
r = fdset_new_fill(&fds);
if (r < 0) {
log_error("Failed to allocate fd set: %s", strerror(-r));
error_message = "Failed to allocate fd set";
goto finish;
} else
fdset_cloexec(fds, true);
@ -1573,19 +1589,23 @@ int main(int argc, char *argv[]) {
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));
error_message = "Failed to drop capability bounding set of usermode helpers";
goto finish;
}
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));
error_message = "Failed to drop capability bounding set";
goto finish;
}
}
if (arg_syscall_archs) {
r = enforce_syscall_archs(arg_syscall_archs);
if (r < 0)
if (r < 0) {
error_message = "Failed to set syscall architectures";
goto finish;
}
}
if (arg_running_as == SYSTEMD_USER) {
@ -1612,6 +1632,7 @@ int main(int argc, char *argv[]) {
r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
if (r < 0) {
log_error("Failed to allocate manager object: %s", strerror(-r));
error_message = "Failed to allocate manager object";
goto finish;
}
@ -1681,12 +1702,15 @@ int main(int argc, char *argv[]) {
r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target);
if (r < 0) {
log_error("Failed to load rescue target: %s", bus_error_message(&error, r));
error_message = "Failed to load rescue target";
goto finish;
} else if (target->load_state == UNIT_ERROR || target->load_state == UNIT_NOT_FOUND) {
log_error("Failed to load rescue target: %s", strerror(-target->load_error));
error_message = "Failed to load rescue target";
goto finish;
} else if (target->load_state == UNIT_MASKED) {
log_error("Rescue target masked.");
error_message = "Rescue target masked";
goto finish;
}
}
@ -1705,10 +1729,12 @@ int main(int argc, char *argv[]) {
r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &default_unit_job);
if (r < 0) {
log_error("Failed to start default target: %s", bus_error_message(&error, r));
error_message = "Failed to start default target";
goto finish;
}
} else if (r < 0) {
log_error("Failed to isolate default target: %s", bus_error_message(&error, r));
error_message = "Failed to isolate default target";
goto finish;
}
@ -1731,6 +1757,7 @@ int main(int argc, char *argv[]) {
r = manager_loop(m);
if (r < 0) {
log_error("Failed to run mainloop: %s", strerror(-r));
error_message = "Failed to run main loop";
goto finish;
}
@ -1750,8 +1777,10 @@ int main(int argc, char *argv[]) {
case MANAGER_REEXECUTE:
if (prepare_reexecute(m, &arg_serialization, &fds, false) < 0)
if (prepare_reexecute(m, &arg_serialization, &fds, false) < 0) {
error_message = "Failed to prepare for reexection";
goto finish;
}
reexecute = true;
log_notice("Reexecuting.");
@ -1764,8 +1793,10 @@ int main(int argc, char *argv[]) {
m->switch_root = m->switch_root_init = NULL;
if (!switch_root_init)
if (prepare_reexecute(m, &arg_serialization, &fds, true) < 0)
if (prepare_reexecute(m, &arg_serialization, &fds, true) < 0) {
error_message = "Failed to prepare for reexection";
goto finish;
}
reexecute = true;
log_notice("Switching root.");
@ -2013,8 +2044,13 @@ finish:
getpid() == 1 ? "freezing" : "quitting");
}
if (getpid() == 1)
if (getpid() == 1) {
if (error_message)
manager_status_printf(NULL, STATUS_TYPE_EMERGENCY,
ANSI_HIGHLIGHT_RED_ON "!!!!!!" ANSI_HIGHLIGHT_OFF,
"%s, freezing.", error_message);
freeze();
}
return retval;
}

6
src/core/manager.c
View File

@ -2969,12 +2969,14 @@ void manager_set_first_boot(Manager *m, bool b) {
void manager_status_printf(Manager *m, StatusType type, const char *status, const char *format, ...) {
va_list ap;
if (!manager_get_show_status(m, type))
/* If m is NULL, assume we're after shutdown and let the messages through. */
if (m && !manager_get_show_status(m, type))
return;
/* XXX We should totally drop the check for ephemeral here
* and thus effectively make 'Type=idle' pointless. */
if (type == STATUS_TYPE_EPHEMERAL && m->n_on_console > 0)
if (type == STATUS_TYPE_EPHEMERAL && m && m->n_on_console > 0)
return;
va_start(ap, format);

2
src/core/selinux-setup.c
View File

@ -113,7 +113,7 @@ int mac_selinux_setup(bool *loaded_policy) {
if (enforce > 0) {
if (!initialized) {
log_error("Failed to load SELinux policy. Freezing.");
log_error("Failed to load SELinux policy.");
return -EIO;
}