Features:
-* switch-root killing spree: don't waitpid, and think about signalfd() serialization
-
* flush jobs when switching root
* autorestart of journald after switch-root is broken
return n_processes;
}
-void broadcast_signal(int sig) {
+void broadcast_signal(int sig, bool wait) {
sigset_t mask, oldmask;
int n_processes;
if (n_processes <= 0)
goto finish;
- wait_for_children(n_processes, &mask);
+ if (wait)
+ wait_for_children(n_processes, &mask);
finish:
sigprocmask(SIG_SETMASK, &oldmask, NULL);
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-void broadcast_signal(int sig);
+void broadcast_signal(int sig, bool wait);
#endif
watchdog_close(true);
if (switch_root_dir) {
- /* Kill all remaining processes from the initrd */
- broadcast_signal(SIGTERM);
- broadcast_signal(SIGKILL);
+ /* Kill all remaining processes from the
+ * initrd, but don't wait for them, so that we
+ * can handle the SIGCHLD for them after
+ * deserializing. */
+ broadcast_signal(SIGTERM, false);
/* And switch root */
r = switch_root(switch_root_dir);
mlockall(MCL_CURRENT|MCL_FUTURE);
log_info("Sending SIGTERM to remaining processes...");
- broadcast_signal(SIGTERM);
+ broadcast_signal(SIGTERM, true);
log_info("Sending SIGKILL to remaining processes...");
- broadcast_signal(SIGKILL);
+ broadcast_signal(SIGKILL, true);
if (in_container) {
need_swapoff = false;