]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #7846 from poettering/nobody-getenv
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 10 Jan 2018 19:18:51 +0000 (20:18 +0100)
committerGitHub <noreply@github.com>
Wed, 10 Jan 2018 19:18:51 +0000 (20:18 +0100)
some assorted fixes and additions, in particular a way to turn off "nobody" synthesizing on a specific system

1  2 
src/core/main.c
src/core/shutdown.c

diff --cc src/core/main.c
Simple merge
index da817c898d28d8521bc9af05f5d329fb803f40c9,ac99211e03d32dcc94f1a830bbf72106704381ac..fb882db99b896194ce768344c962ffde6589fd40
@@@ -333,14 -323,13 +333,13 @@@ int main(int argc, char *argv[]) 
          if (!in_container)
                  sync_with_progress();
  
-         /* Prevent coredumps */
-         disable_core_dumps();
+         disable_coredumps();
  
          log_info("Sending SIGTERM to remaining processes...");
 -        broadcast_signal(SIGTERM, true, true);
 +        broadcast_signal(SIGTERM, true, true, arg_timeout);
  
          log_info("Sending SIGKILL to remaining processes...");
 -        broadcast_signal(SIGKILL, true, false);
 +        broadcast_signal(SIGKILL, true, false, arg_timeout);
  
          need_umount = !in_container;
          need_swapoff = !in_container;