From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Apr 2015 18:46:33 +0000 (+0200)
Subject: nspawn: when run as a service, don't ask machined for terminatin of ourselves
X-Git-Tag: v220~256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a2399e57d9f5943a508720aaddc87512a972378;p=thirdparty%2Fsystemd.git

nspawn: when run as a service, don't ask machined for terminatin of ourselves
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 29652e00e5b..05d2c71e450 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2081,6 +2081,11 @@ static int terminate_machine(pid_t pid) {
         if (!arg_register)
                 return 0;
 
+        /* If we are reusing the unit, then just exit, systemd will do
+         * the right thing when we exit. */
+        if (arg_keep_unit)
+                return 0;
+
         r = sd_bus_default_system(&bus);
         if (r < 0)
                 return log_error_errno(r, "Failed to open system bus: %m");