chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 792b316c61b8e980fec719dee453c69da1723046..b5230c948b58190267befe9d4ddcfb560d72284d 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-75,9
+75,7
@@
#include "selinux-setup.h"
#include "ima-setup.h"
#include "smack-setup.h"
#include "selinux-setup.h"
#include "ima-setup.h"
#include "smack-setup.h"
-#ifdef HAVE_KMOD
#include "kmod-setup.h"
#include "kmod-setup.h"
-#endif
static enum {
ACTION_RUN,
static enum {
ACTION_RUN,
@@
-133,7
+131,7
@@
noreturn static void crash(int sig) {
/* Pass this on immediately, if this is not PID 1 */
raise(sig);
else if (!arg_dump_core)
/* Pass this on immediately, if this is not PID 1 */
raise(sig);
else if (!arg_dump_core)
- log_e
rror
("Caught <%s>, not dumping core.", signal_to_string(sig));
+ log_e
mergency
("Caught <%s>, not dumping core.", signal_to_string(sig));
else {
struct sigaction sa = {
.sa_handler = nop_handler,
else {
struct sigaction sa = {
.sa_handler = nop_handler,
@@
-146,7
+144,7
@@
noreturn static void crash(int sig) {
pid = fork();
if (pid < 0)
pid = fork();
if (pid < 0)
- log_e
rror
("Caught <%s>, cannot fork for core dump: %m", signal_to_string(sig));
+ log_e
mergency
("Caught <%s>, cannot fork for core dump: %m", signal_to_string(sig));
else if (pid == 0) {
struct rlimit rl = {};
else if (pid == 0) {
struct rlimit rl = {};
@@
-177,11
+175,11
@@
noreturn static void crash(int sig) {
/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
/* Order things nicely. */
r = wait_for_terminate(pid, &status);
if (r < 0)
- log_e
rror("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(-r
));
+ log_e
mergency_errno(-r, "Caught <%s>, waitpid() failed: %m", signal_to_string(sig
));
else if (status.si_code != CLD_DUMPED)
else if (status.si_code != CLD_DUMPED)
- log_e
rror
("Caught <%s>, core dump failed.", signal_to_string(sig));
+ log_e
mergency
("Caught <%s>, core dump failed.", signal_to_string(sig));
else
else
- log_e
rror
("Caught <%s>, dumped core as pid "PID_FMT".", signal_to_string(sig), pid);
+ log_e
mergency
("Caught <%s>, dumped core as pid "PID_FMT".", signal_to_string(sig), pid);
}
}
}
}
@@
-203,19
+201,19
@@
noreturn static void crash(int sig) {
pid = fork();
if (pid < 0)
pid = fork();
if (pid < 0)
- log_e
rror
("Failed to fork off crash shell: %m");
+ log_e
mergency
("Failed to fork off crash shell: %m");
else if (pid == 0) {
make_console_stdio();
execl("/bin/sh", "/bin/sh", NULL);
else if (pid == 0) {
make_console_stdio();
execl("/bin/sh", "/bin/sh", NULL);
- log_e
rror
("execl() failed: %m");
+ log_e
mergency
("execl() failed: %m");
_exit(1);
}
log_info("Successfully spawned crash shell as pid "PID_FMT".", pid);
}
_exit(1);
}
log_info("Successfully spawned crash shell as pid "PID_FMT".", pid);
}
- log_
info
("Freezing execution.");
+ log_
emergency
("Freezing execution.");
freeze();
}
freeze();
}
@@
-234,7
+232,7
@@
static int console_setup(void) {
tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (tty_fd < 0) {
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;
}
return tty_fd;
}
@@
-242,7
+240,7
@@
static int console_setup(void) {
* pictures already from initrd. */
r = reset_terminal_fd(tty_fd, false);
if (r < 0) {
* 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;
}
return r;
}
@@
-269,6
+267,7
@@
static int parse_proc_cmdline_item(const char *key, const char *value) {
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
"-b", SPECIAL_EMERGENCY_TARGET,
static const char * const rlmap[] = {
"emergency", SPECIAL_EMERGENCY_TARGET,
"-b", SPECIAL_EMERGENCY_TARGET,
+ "rescue", SPECIAL_RESCUE_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
"single", SPECIAL_RESCUE_TARGET,
"-s", SPECIAL_RESCUE_TARGET,
"s", SPECIAL_RESCUE_TARGET,
@@
-469,7
+468,7
@@
static int config_parse_cpu_affinity2(
if (c) {
if (sched_setaffinity(0, CPU_ALLOC_SIZE(ncpus), c) < 0)
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);
}
CPU_FREE(c);
}
@@
-808,7
+807,7
@@
static int parse_argv(int argc, char *argv[]) {
r = set_default_unit(optarg);
if (r < 0) {
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;
}
return r;
}
@@
-991,7
+990,7
@@
static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
r = manager_open_serialization(m, &f);
if (r < 0) {
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;
}
goto fail;
}
@@
-1002,13
+1001,13
@@
static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
fds = fdset_new();
if (!fds) {
r = -ENOMEM;
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) {
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;
}
goto fail;
}
@@
-1019,13
+1018,13
@@
static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds, bool switching
r = fd_cloexec(fileno(f), false);
if (r < 0) {
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) {
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;
}
goto fail;
}
@@
-1072,7
+1071,7
@@
static int bump_rlimit_nofile(struct rlimit *saved_rlimit) {
nl.rlim_cur = nl.rlim_max = 64*1024;
r = setrlimit_closest(RLIMIT_NOFILE, &nl);
if (r < 0) {
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;
}
return r;
}
@@
-1155,20
+1154,20
@@
static int enforce_syscall_archs(Set *archs) {
if (r == -EEXIST)
continue;
if (r < 0) {
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) {
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)
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);
finish:
seccomp_release(seccomp);
@@
-1194,7
+1193,7
@@
static int status_welcome(void) {
}
if (r < 0 && r != -ENOENT)
}
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",
return status_printf(NULL, false, false,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
@@
-1234,6
+1233,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 };
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")) {
#ifdef HAVE_SYSV_COMPAT
if (getpid() != 1 && strstr(program_invocation_short_name, "init")) {
@@
-1292,17
+1292,23
@@
int main(int argc, char *argv[]) {
if (!skip_setup) {
mount_setup_early();
dual_timestamp_get(&security_start_timestamp);
if (!skip_setup) {
mount_setup_early();
dual_timestamp_get(&security_start_timestamp);
- if (selinux_setup(&loaded_policy) < 0)
+ if (mac_selinux_setup(&loaded_policy) < 0) {
+ error_message = "Failed to load SELinux policy";
goto finish;
goto finish;
- if (ima_setup() < 0)
+ } else if (ima_setup() < 0) {
+ error_message = "Failed to load IMA policy";
goto finish;
goto finish;
- if (smack_setup(&loaded_policy) < 0)
+ } else if (mac_smack_setup(&loaded_policy) < 0) {
+ error_message = "Failed to load SMACK policy";
goto finish;
goto finish;
+ }
dual_timestamp_get(&security_finish_timestamp);
}
dual_timestamp_get(&security_finish_timestamp);
}
- if (label_init(NULL) < 0)
+ if (mac_selinux_init(NULL) < 0) {
+ error_message = "Failed to initialize SELinux policy";
goto finish;
goto finish;
+ }
if (!skip_setup) {
if (clock_is_localtime() > 0) {
if (!skip_setup) {
if (clock_is_localtime() > 0) {
@@
-1318,7
+1324,7
@@
int main(int argc, char *argv[]) {
*/
r = clock_set_timezone(&min);
if (r < 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()) {
else
log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
} else if (!in_initrd()) {
@@
-1377,20
+1383,30
@@
int main(int argc, char *argv[]) {
/* Initialize default unit */
r = set_default_unit(SPECIAL_DEFAULT_TARGET);
if (r < 0) {
/* Initialize default unit */
r = set_default_unit(SPECIAL_DEFAULT_TARGET);
if (r < 0) {
- log_error("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();
goto finish;
}
r = initialize_join_controllers();
- if (r < 0)
+ if (r < 0) {
+ error_message = "Failed to initalize cgroup controllers";
goto finish;
goto finish;
+ }
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid() == 1) {
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid() == 1) {
+
+ /* Load the kernel modules early, so that we kdbus.ko is loaded before kdbusfs shall be mounted */
+ if (!skip_setup)
+ kmod_setup();
+
r = mount_setup(loaded_policy);
r = mount_setup(loaded_policy);
- if (r < 0)
+ if (r < 0) {
+ error_message = "Failed to mount API filesystems";
goto finish;
goto finish;
+ }
}
/* Reset all signal handlers. */
}
/* Reset all signal handlers. */
@@
-1398,19
+1414,25
@@
int main(int argc, char *argv[]) {
ignore_signals(SIGNALS_IGNORE, -1);
ignore_signals(SIGNALS_IGNORE, -1);
- if (parse_config_file() < 0)
+ if (parse_config_file() < 0) {
+ error_message = "Failed to parse config file";
goto finish;
goto finish;
+ }
- if (arg_running_as == SYSTEMD_SYSTEM)
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- goto finish;
+ if (arg_running_as == SYSTEMD_SYSTEM) {
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0)
+ 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();
/* 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;
goto finish;
+ }
if (arg_action == ACTION_TEST &&
geteuid() == 0) {
if (arg_action == ACTION_TEST &&
geteuid() == 0) {
@@
-1466,7
+1488,8
@@
int main(int argc, char *argv[]) {
/* Remember open file descriptors for later deserialization */
r = fdset_new_fill(&fds);
if (r < 0) {
/* Remember open file descriptors for later deserialization */
r = fdset_new_fill(&fds);
if (r < 0) {
- log_error("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);
goto finish;
} else
fdset_cloexec(fds, true);
@@
-1550,9
+1573,6
@@
int main(int argc, char *argv[]) {
if (arg_show_status > 0 || plymouth_running())
status_welcome();
if (arg_show_status > 0 || plymouth_running())
status_welcome();
-#ifdef HAVE_KMOD
- kmod_setup();
-#endif
hostname_setup();
machine_id_setup(NULL);
loopback_setup();
hostname_setup();
machine_id_setup(NULL);
loopback_setup();
@@
-1571,20
+1591,24
@@
int main(int argc, char *argv[]) {
if (arg_capability_bounding_set_drop) {
r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
if (r < 0) {
if (arg_capability_bounding_set_drop) {
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));
+ 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) {
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));
+ 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);
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;
goto finish;
+ }
}
if (arg_running_as == SYSTEMD_USER) {
}
if (arg_running_as == SYSTEMD_USER) {
@@
-1602,7
+1626,7
@@
int main(int argc, char *argv[]) {
if (empty_etc) {
r = unit_file_preset_all(UNIT_FILE_SYSTEM, false, NULL, UNIT_FILE_PRESET_FULL, false, NULL, 0);
if (r < 0)
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.");
}
else
log_info("Populated /etc with preset unit settings.");
}
@@
-1610,7
+1634,8
@@
int main(int argc, char *argv[]) {
r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
if (r < 0) {
r = manager_new(arg_running_as, arg_action == ACTION_TEST, &m);
if (r < 0) {
- log_error("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;
}
goto finish;
}
@@
-1628,6
+1653,7
@@
int main(int argc, char *argv[]) {
m->default_memory_accounting = arg_default_memory_accounting;
m->runtime_watchdog = arg_runtime_watchdog;
m->shutdown_watchdog = arg_shutdown_watchdog;
m->default_memory_accounting = arg_default_memory_accounting;
m->runtime_watchdog = arg_runtime_watchdog;
m->shutdown_watchdog = arg_shutdown_watchdog;
+
m->userspace_timestamp = userspace_timestamp;
m->kernel_timestamp = kernel_timestamp;
m->initrd_timestamp = initrd_timestamp;
m->userspace_timestamp = userspace_timestamp;
m->kernel_timestamp = kernel_timestamp;
m->initrd_timestamp = initrd_timestamp;
@@
-1646,7
+1672,7
@@
int main(int argc, char *argv[]) {
r = manager_startup(m, arg_serialization, fds);
if (r < 0)
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. */
/* This will close all file descriptors that were opened, but
* not claimed by any unit. */
@@
-1678,13
+1704,16
@@
int main(int argc, char *argv[]) {
r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target);
if (r < 0) {
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));
+ 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) {
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));
+ 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) {
goto finish;
} else if (target->load_state == UNIT_MASKED) {
- log_error("Rescue target masked.");
+ log_emergency("Rescue target masked.");
+ error_message = "Rescue target masked";
goto finish;
}
}
goto finish;
}
}
@@
-1702,11
+1731,13
@@
int main(int argc, char *argv[]) {
r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &default_unit_job);
if (r < 0) {
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));
+ 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) {
goto finish;
}
} else if (r < 0) {
- log_error("Failed to isolate default target: %s", bus_error_message(&error, r));
+ log_emergency("Failed to isolate default target: %s", bus_error_message(&error, r));
+ error_message = "Failed to isolate default target";
goto finish;
}
goto finish;
}
@@
-1715,7
+1746,7
@@
int main(int argc, char *argv[]) {
after_startup = now(CLOCK_MONOTONIC);
log_full(arg_action == ACTION_TEST ? LOG_INFO : LOG_DEBUG,
"Loaded units and determined initial transaction in %s.",
after_startup = now(CLOCK_MONOTONIC);
log_full(arg_action == ACTION_TEST ? LOG_INFO : LOG_DEBUG,
"Loaded units and determined initial transaction in %s.",
- format_timespan(timespan, sizeof(timespan), after_startup - before_startup,
0
));
+ format_timespan(timespan, sizeof(timespan), after_startup - before_startup,
100 * USEC_PER_MSEC
));
if (arg_action == ACTION_TEST) {
printf("-> By jobs:\n");
if (arg_action == ACTION_TEST) {
printf("-> By jobs:\n");
@@
-1728,7
+1759,8
@@
int main(int argc, char *argv[]) {
for (;;) {
r = manager_loop(m);
if (r < 0) {
for (;;) {
r = manager_loop(m);
if (r < 0) {
- log_error("Failed to run mainloop: %s", strerror(-r));
+ log_emergency_errno(-r, "Failed to run main loop: %m");
+ error_message = "Failed to run main loop";
goto finish;
}
goto finish;
}
@@
-1743,13
+1775,15
@@
int main(int argc, char *argv[]) {
log_info("Reloading.");
r = manager_reload(m);
if (r < 0)
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:
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;
goto finish;
+ }
reexecute = true;
log_notice("Reexecuting.");
reexecute = true;
log_notice("Reexecuting.");
@@
-1762,8
+1796,10
@@
int main(int argc, char *argv[]) {
m->switch_root = m->switch_root_init = NULL;
if (!switch_root_init)
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;
goto finish;
+ }
reexecute = true;
log_notice("Switching root.");
reexecute = true;
log_notice("Switching root.");
@@
-1795,10
+1831,7
@@
int main(int argc, char *argv[]) {
finish:
pager_close();
finish:
pager_close();
- if (m) {
- manager_free(m);
- m = NULL;
- }
+ m = manager_free(m);
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) {
free(arg_default_rlimit[j]);
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) {
free(arg_default_rlimit[j]);
@@
-1816,12
+1849,11
@@
finish:
set_free(arg_syscall_archs);
arg_syscall_archs = NULL;
set_free(arg_syscall_archs);
arg_syscall_archs = NULL;
-
label
_finish();
+
mac_selinux
_finish();
if (reexecute) {
const char **args;
unsigned i, args_size;
if (reexecute) {
const char **args;
unsigned i, args_size;
- sigset_t ss;
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
@@
-1841,10
+1873,10
@@
finish:
* deserializing. */
broadcast_signal(SIGTERM, false, true);
* deserializing. */
broadcast_signal(SIGTERM, false, true);
- /* And switch root */
- r = switch_root(switch_root_dir);
+ /* 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)
if (r < 0)
- log_error
("Failed to switch root, ignoring: %s", strerror(-r)
);
+ log_error
_errno(-r, "Failed to switch root, trying to continue: %m"
);
}
args_size = MAX(6, argc+1);
}
args_size = MAX(6, argc+1);
@@
-1905,12
+1937,10
@@
finish:
args[i++] = NULL;
assert(i <= args_size);
args[i++] = NULL;
assert(i <= args_size);
- /*
r
eenable any blocked signals, especially important
+ /*
R
eenable any blocked signals, especially important
* if we switch from initial ramdisk to init=... */
reset_all_signal_handlers();
* if we switch from initial ramdisk to init=... */
reset_all_signal_handlers();
-
- assert_se(sigemptyset(&ss) == 0);
- assert_se(sigprocmask(SIG_SETMASK, &ss, NULL) == 0);
+ reset_signal_mask();
if (switch_root_init) {
args[0] = switch_root_init;
if (switch_root_init) {
args[0] = switch_root_init;
@@
-2014,8
+2044,13
@@
finish:
getpid() == 1 ? "freezing" : "quitting");
}
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();
freeze();
+ }
return retval;
}
return retval;
}