/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
- log_emergency("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(-r));
+ log_emergency_errno(-r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig));
else if (status.si_code != CLD_DUMPED)
log_emergency("Caught <%s>, core dump failed.", signal_to_string(sig));
else
tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (tty_fd < 0) {
- log_error("Failed to open /dev/console: %s", strerror(-tty_fd));
+ log_error_errno(-tty_fd, "Failed to open /dev/console: %m");
return tty_fd;
}
* pictures already from initrd. */
r = reset_terminal_fd(tty_fd, false);
if (r < 0) {
- log_error("Failed to reset /dev/console: %s", strerror(-r));
+ log_error_errno(-r, "Failed to reset /dev/console: %m");
return r;
}
if (c) {
if (sched_setaffinity(0, CPU_ALLOC_SIZE(ncpus), c) < 0)
- log_warning_unit(unit, "Failed to set CPU affinity: %m");
+ log_unit_warning(unit, "Failed to set CPU affinity: %m");
CPU_FREE(c);
}
r = set_default_unit(optarg);
if (r < 0) {
- log_error("Failed to set default unit %s: %s", optarg, strerror(-r));
+ log_error_errno(-r, "Failed to set default unit %s: %m", optarg);
return r;
}
r = manager_open_serialization(m, &f);
if (r < 0) {
- log_error("Failed to create serialization file: %s", strerror(-r));
+ log_error_errno(-r, "Failed to create serialization file: %m");
goto fail;
}
fds = fdset_new();
if (!fds) {
r = -ENOMEM;
- log_error("Failed to allocate fd set: %s", strerror(-r));
+ log_error_errno(-r, "Failed to allocate fd set: %m");
goto fail;
}
r = manager_serialize(m, f, fds, switching_root);
if (r < 0) {
- log_error("Failed to serialize state: %s", strerror(-r));
+ log_error_errno(-r, "Failed to serialize state: %m");
goto fail;
}
r = fd_cloexec(fileno(f), false);
if (r < 0) {
- log_error("Failed to disable O_CLOEXEC for serialization: %s", strerror(-r));
+ log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization: %m");
goto fail;
}
r = fdset_cloexec(fds, false);
if (r < 0) {
- log_error("Failed to disable O_CLOEXEC for serialization fds: %s", strerror(-r));
+ log_error_errno(-r, "Failed to disable O_CLOEXEC for serialization fds: %m");
goto fail;
}
nl.rlim_cur = nl.rlim_max = 64*1024;
r = setrlimit_closest(RLIMIT_NOFILE, &nl);
if (r < 0) {
- log_error("Setting RLIMIT_NOFILE failed: %s", strerror(-r));
+ log_error_errno(-r, "Setting RLIMIT_NOFILE failed: %m");
return r;
}
if (r == -EEXIST)
continue;
if (r < 0) {
- log_error("Failed to add architecture to seccomp: %s", strerror(-r));
+ log_error_errno(-r, "Failed to add architecture to seccomp: %m");
goto finish;
}
}
r = seccomp_attr_set(seccomp, SCMP_FLTATR_CTL_NNP, 0);
if (r < 0) {
- log_error("Failed to unset NO_NEW_PRIVS: %s", strerror(-r));
+ log_error_errno(-r, "Failed to unset NO_NEW_PRIVS: %m");
goto finish;
}
r = seccomp_load(seccomp);
if (r < 0)
- log_error("Failed to add install architecture seccomp: %s", strerror(-r));
+ log_error_errno(-r, "Failed to add install architecture seccomp: %m");
finish:
seccomp_release(seccomp);
}
if (r < 0 && r != -ENOENT)
- log_warning("Failed to read os-release file: %s", strerror(-r));
+ log_warning_errno(-r, "Failed to read os-release file: %m");
return status_printf(NULL, false, false,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
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")) {
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) {
*/
r = clock_set_timezone(&min);
if (r < 0)
- log_error("Failed to apply local time delta, ignoring: %s", strerror(-r));
+ log_error_errno(-r, "Failed to apply local time delta, ignoring: %m");
else
log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
} else if (!in_initrd()) {
/* Initialize default unit */
r = set_default_unit(SPECIAL_DEFAULT_TARGET);
if (r < 0) {
- log_emergency("Failed to set default unit %s: %s", SPECIAL_DEFAULT_TARGET, strerror(-r));
+ log_emergency_errno(-r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET);
+ 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. */
kmod_setup();
r = mount_setup(loaded_policy);
- if (r < 0)
+ if (r < 0) {
+ error_message = "Failed to mount API filesystems";
goto finish;
+ }
}
/* Reset all signal handlers. */
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) {
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
- log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
+ log_warning_errno(-r, "Failed to parse kernel command line, ignoring: %m");
}
/* Note that this also parses bits from the kernel command
* 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) {
/* Remember open file descriptors for later deserialization */
r = fdset_new_fill(&fds);
if (r < 0) {
- log_emergency("Failed to allocate fd set: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to allocate fd set: %m");
+ error_message = "Failed to allocate fd set";
goto finish;
} else
fdset_cloexec(fds, true);
if (arg_capability_bounding_set_drop) {
r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
if (r < 0) {
- log_emergency("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to drop capability bounding set of usermode helpers: %m");
+ 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_emergency("Failed to drop capability bounding set: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to drop capability bounding set: %m");
+ 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) {
if (empty_etc) {
r = unit_file_preset_all(UNIT_FILE_SYSTEM, false, NULL, UNIT_FILE_PRESET_FULL, false, NULL, 0);
if (r < 0)
- log_warning("Failed to populate /etc with preset unit settings, ignoring: %s", strerror(-r));
+ log_warning_errno(-r, "Failed to populate /etc with preset unit settings, ignoring: %m");
else
log_info("Populated /etc with preset unit settings.");
}
r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
if (r < 0) {
- log_emergency("Failed to allocate manager object: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to allocate manager object: %m");
+ error_message = "Failed to allocate manager object";
goto finish;
}
r = manager_startup(m, arg_serialization, fds);
if (r < 0)
- log_error("Failed to fully start up daemon: %s", strerror(-r));
+ log_error_errno(-r, "Failed to fully start up daemon: %m");
/* This will close all file descriptors that were opened, but
* not claimed by any unit. */
r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target);
if (r < 0) {
log_emergency("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_emergency("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_emergency("Rescue target masked.");
+ error_message = "Rescue target masked";
goto finish;
}
}
r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &default_unit_job);
if (r < 0) {
log_emergency("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_emergency("Failed to isolate default target: %s", bus_error_message(&error, r));
+ error_message = "Failed to isolate default target";
goto finish;
}
for (;;) {
r = manager_loop(m);
if (r < 0) {
- log_emergency("Failed to run main loop: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to run main loop: %m");
+ error_message = "Failed to run main loop";
goto finish;
}
log_info("Reloading.");
r = manager_reload(m);
if (r < 0)
- log_error("Failed to reload: %s", strerror(-r));
+ log_error_errno(-r, "Failed to reload: %m");
break;
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.");
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.");
/* And switch root with MS_MOVE, because we remove the old directory afterwards and detach it. */
r = switch_root(switch_root_dir, "/mnt", true, MS_MOVE);
if (r < 0)
- log_error("Failed to switch root, trying to continue: %s", strerror(-r));
+ log_error_errno(-r, "Failed to switch root, trying to continue: %m");
}
args_size = MAX(6, argc+1);
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;
}
~ianmdlvl / elogind.git / blobdiff