From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 10 Jan 2018 19:18:51 +0000 (+0100)
Subject: Merge pull request #7846 from poettering/nobody-getenv
X-Git-Tag: v237~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9883559e3d29246a40973461e57915f4ff4c8ea;p=platform%2Fupstream%2Fsystemd.git

Merge pull request #7846 from poettering/nobody-getenv

some assorted fixes and additions, in particular a way to turn off "nobody" synthesizing on a specific system
---

a9883559e3d29246a40973461e57915f4ff4c8ea
diff --cc src/core/shutdown.c
index da817c8,ac99211..fb882db
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@@ -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;