chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rearrange Unit to make pahole happy
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index ed690162bfbd43f60b06e49003cd826b9af3d0f9..95597deaf2d3b5e3cacf00e313d6c7eb2e3e9136 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-117,7
+117,7
@@
static bool arg_default_cpu_accounting = false;
static bool arg_default_blockio_accounting = false;
static bool arg_default_memory_accounting = false;
static usec_t arg_start_timeout_usec = DEFAULT_MANAGER_START_TIMEOUT_USEC;
static bool arg_default_blockio_accounting = false;
static bool arg_default_memory_accounting = false;
static usec_t arg_start_timeout_usec = DEFAULT_MANAGER_START_TIMEOUT_USEC;
-static FailureAction arg_start_timeout_action = FAILURE_ACTION_
REBOOT
_FORCE;
+static FailureAction arg_start_timeout_action = FAILURE_ACTION_
POWEROFF
_FORCE;
static char *arg_start_timeout_reboot_arg = NULL;
static void nop_handler(int sig) {}
static char *arg_start_timeout_reboot_arg = NULL;
static void nop_handler(int sig) {}
@@
-272,6
+272,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,
@@
-1307,7
+1308,7
@@
int main(int argc, char *argv[]) {
dual_timestamp_get(&security_finish_timestamp);
}
dual_timestamp_get(&security_finish_timestamp);
}
- if (
label
_init(NULL) < 0)
+ if (
mac_selinux
_init(NULL) < 0)
goto finish;
if (!skip_setup) {
goto finish;
if (!skip_setup) {
@@
-1725,7
+1726,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");
@@
-1829,12
+1830,11
@@
finish:
free(arg_start_timeout_reboot_arg);
arg_start_timeout_reboot_arg = NULL;
free(arg_start_timeout_reboot_arg);
arg_start_timeout_reboot_arg = 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
@@
-1854,10
+1854,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("Failed to switch root,
trying to continue
: %s", strerror(-r));
}
args_size = MAX(6, argc+1);
}
args_size = MAX(6, argc+1);
@@
-1918,12
+1918,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;