picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: clean-up signal reset logic when reexec

Browse source 
There's no need to save the old sigmask, if we are going to die. Let's
simplify this. Also, reset all the signal handlers, so that we don't
leave SIG_IGN set for some of them across reexec.
This commit is contained in:
Lennart Poettering 2014-06-20 16:58:21 +02:00
parent 2f3b873a49
commit 9bfcda9528
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/main.c
View file

@ -1824,7 +1824,7 @@ finish:
if (reexecute) {
const char **args;
unsigned i, args_size;
sigset_t ss, o_ss;
sigset_t ss;
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
@ -1910,8 +1910,10 @@ finish:
/* reenable any blocked signals, especially important
* if we switch from initial ramdisk to init=... */
sigemptyset(&ss);
sigprocmask(SIG_SETMASK, &ss, &o_ss);
reset_all_signal_handlers();
assert_se(sigemptyset(&ss) == 0);
assert_se(sigprocmask(SIG_SETMASK, &ss, NULL) == 0);
if (switch_root_init) {
args[0] = switch_root_init;
@ -1931,8 +1933,6 @@ finish:
log_error("Failed to execute /bin/sh, giving up: %m");
} else
log_warning("Failed to execute /sbin/init, giving up: %m");
sigprocmask(SIG_SETMASK, &o_ss, NULL);
}
if (arg_serialization) {