Merge pull request #4481 from poettering/perpetual

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

diff --cc src/core/unit.c
index 8e6cef1,068d319..463e6d6
--- 1/src/core/unit.c
--- 2/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)

diff --cc src/core/unit.h
Simple merge

diff --cc src/systemctl/systemctl.c
Simple merge