From 87123a31abae75be19267ac70ae92f6824fc01e5 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rmcgover@redhat.com>
Date: Mon, 21 Feb 2022 14:48:03 +1000
Subject: [PATCH] dev env: fix deprecated KillMode=none

These units were originally created by "podman generate systemd"
which inserted a KillMode=none directive. That value of KillMode
was deprecated by systemd and will be removed in the future.

This commit updates the units to be aligned with podman's fix for
the issue in https://github.com/containers/podman/issues/8615,
which was to drop KillMode and add TimeoutStopSec.
---
 scripts/systemd/exodus-gw-db.service         | 2 +-
 scripts/systemd/exodus-gw-localstack.service | 2 +-
 scripts/systemd/exodus-gw-sidecar.service    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/systemd/exodus-gw-db.service b/scripts/systemd/exodus-gw-db.service
index a842bdc5..9a21183a 100644
--- a/scripts/systemd/exodus-gw-db.service
+++ b/scripts/systemd/exodus-gw-db.service
@@ -35,7 +35,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]
diff --git a/scripts/systemd/exodus-gw-localstack.service b/scripts/systemd/exodus-gw-localstack.service
index 217c0ea7..dee0e0df 100644
--- a/scripts/systemd/exodus-gw-localstack.service
+++ b/scripts/systemd/exodus-gw-localstack.service
@@ -49,7 +49,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]
diff --git a/scripts/systemd/exodus-gw-sidecar.service b/scripts/systemd/exodus-gw-sidecar.service
index 80f6c857..4bdc9971 100644
--- a/scripts/systemd/exodus-gw-sidecar.service
+++ b/scripts/systemd/exodus-gw-sidecar.service
@@ -62,7 +62,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --c
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
 PIDFile=%t/%n-pid
-KillMode=none
+TimeoutStopSec=60
 Type=forking
 
 [Install]