From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 3 Nov 2016 01:03:26 +0000 (-0400)
Subject: Merge pull request #4481 from poettering/perpetual
X-Git-Tag: v232~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa6328cc447a4a834ebc8d68ae6c335f4c9c9d3;p=thirdparty%2Fsystemd.git

Merge pull request #4481 from poettering/perpetual

Add "perpetual" unit concept, sysctl fixes, networkd fixes, systemctl color fixes, nspawn discard.
---

7fa6328cc447a4a834ebc8d68ae6c335f4c9c9d3
diff --cc src/core/unit.c
index 8e6cef103b3,068d319206c..463e6d6a628
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@@ -322,10 -338,10 +340,10 @@@ bool unit_check_gc(Unit *u) 
  
          /* But we keep the unit object around for longer when it is
           * referenced or configured to not be gc'ed */
 -        if (state != UNIT_INACTIVE)
 +        if (!inactive)
                  return true;
  
-         if (u->no_gc)
+         if (u->perpetual)
                  return true;
  
          if (u->refs)