From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Dec 2017 10:58:25 +0000 (+0100)
Subject: nspawn: turn on watchdog logic for nspawn too
X-Git-Tag: v236~41^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fd010bb1b232f8d7afd9ae6b96d844d9f65ea88;p=thirdparty%2Fsystemd.git

nspawn: turn on watchdog logic for nspawn too

It's a long-running daemon, and it's easy to enable, hence do it.
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 4b82345d08e..f217def92d5 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3642,6 +3642,8 @@ static int run(int master,
         if (r < 0)
                 return log_error_errno(r, "Failed to get default event source: %m");
 
+        (void) sd_event_set_watchdog(event, true);
+
         if (bus) {
                 r = sd_bus_attach_event(bus, event, 0);
                 if (r < 0)
diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in
index 3d3590751f1..c3194d4f21d 100644
--- a/units/systemd-nspawn@.service.in
+++ b/units/systemd-nspawn@.service.in
@@ -21,6 +21,7 @@ KillMode=mixed
 Type=notify
 RestartForceExitStatus=133
 SuccessExitStatus=133
+WatchdogSec=3min
 Slice=machine.slice
 Delegate=yes
 TasksMax=16384