diff options
| author | Ruediger Oertel <ro@suse.de> | 2014-06-13 16:41:06 +0200 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-06-16 15:23:17 +0200 |
| commit | 5a85ca1cb622fda4a39c8a6f00dccea7f8a1e82a (patch) | |
| tree | 1a5aedafe3796d8d8ae921046d8c27f111324973 /src | |
| parent | 9489490a693ec5d1e3b49eecedb0ca5511568665 (diff) | |
Reset signal-mask on re-exec to init=..
Process 1 (aka init) needs to be started with an empty signal mask.
That includes the process 1 that's started after the initrd is finished.
When the initrd is using systemd (as it does with dracut based initrds)
then it is systemd that calls the real init. Normally this is systemd
again, except when the user uses for instance "init=/bin/bash" on the
kernel command line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/main.c b/src/core/main.c index 3aac5d1d97..3e57f07c42 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1843,6 +1843,7 @@ finish: if (reexecute) { const char **args; unsigned i, args_size; + sigset_t ss, o_ss; /* Close and disarm the watchdog, so that the new * instance can reinitialize it, but doesn't get @@ -1926,6 +1927,11 @@ finish: args[i++] = NULL; assert(i <= args_size); + /* reenable any blocked signals, especially important + * if we switch from initial ramdisk to init=... */ + sigemptyset(&ss); + sigprocmask(SIG_SETMASK, &ss, &o_ss); + if (switch_root_init) { args[0] = switch_root_init; execv(args[0], (char* const*) args); @@ -1944,6 +1950,8 @@ 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) { |