From 1a2399e57d9f5943a508720aaddc87512a972378 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Apr 2015 20:46:33 +0200
Subject: nspawn: when run as a service, don't ask machined for terminatin of
 ourselves

---
 src/nspawn/nspawn.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/nspawn')

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 29652e00e5..05d2c71e45 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");
-- 
cgit v1.2.3-54-g00ecf