From a90da95e1be427da5381ca83a44bfc2d3cf55604 Mon Sep 17 00:00:00 2001
From: tomsweeneyredhat <tsweeney@redhat.com>
Date: Thu, 9 Jun 2022 19:54:28 -0400
Subject: [PATCH] [v1.6.4-rhel] Fix webserver startup w/ systemd

Allow a webserver to come backup after it is restarted by systemd.
This was backported to all other Podman releases already, but not to
v1.6.4 at the time.  However, this BZ:
https://bugzilla.redhat.com/show_bug.cgi?id=2091721 is asking for the
fix.

Backport of https://github.com/containers/podman/commit/05a0bf7c07e5

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
---
 pkg/systemdgen/systemdgen.go      | 2 ++
 pkg/systemdgen/systemdgen_test.go | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/pkg/systemdgen/systemdgen.go b/pkg/systemdgen/systemdgen.go
index 09d3c6fd52..296c720662 100644
--- a/pkg/systemdgen/systemdgen.go
+++ b/pkg/systemdgen/systemdgen.go
@@ -71,6 +71,8 @@ const containerTemplate = `# {{.ServiceName}}.service
 [Unit]
 Description=Podman {{.ServiceName}}.service
 Documentation=man:podman-generate-systemd(1)
+Wants=network.target
+After=network-online.target
 {{- if .BoundToServices}}
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/pkg/systemdgen/systemdgen_test.go b/pkg/systemdgen/systemdgen_test.go
index 1ddb0c5140..bb9123f7e4 100644
--- a/pkg/systemdgen/systemdgen_test.go
+++ b/pkg/systemdgen/systemdgen_test.go
@@ -39,6 +39,8 @@ func TestCreateContainerSystemdUnit(t *testing.T) {
 [Unit]
 Description=Podman container-639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401.service
 Documentation=man:podman-generate-systemd(1)
+Wants=network.target
+After=network-online.target
 
 [Service]
 Restart=always
@@ -57,6 +59,8 @@ WantedBy=multi-user.target`
 [Unit]
 Description=Podman container-foobar.service
 Documentation=man:podman-generate-systemd(1)
+Wants=network.target
+After=network-online.target
 
 [Service]
 Restart=always
@@ -75,6 +79,8 @@ WantedBy=multi-user.target`
 [Unit]
 Description=Podman container-foobar.service
 Documentation=man:podman-generate-systemd(1)
+Wants=network.target
+After=network-online.target
 RefuseManualStart=yes
 RefuseManualStop=yes
 BindsTo=a.service b.service c.service pod.service
@@ -97,6 +103,8 @@ WantedBy=multi-user.target`
 [Unit]
 Description=Podman pod-123abc.service
 Documentation=man:podman-generate-systemd(1)
+Wants=network.target
+After=network-online.target
 Requires=container-1.service container-2.service
 Before=container-1.service container-2.service