From 3c5c0cc104f2a01f752b6025e30faad051d1b4ce Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Fri, 27 Jun 2025 00:22:39 +0200
Subject: podman: T9129: Use systemd quadlet for containers and networks

---
 data/templates/container/quadlet-network.j2 |  8 ++++++++
 data/templates/container/quadlet-unit.j2    | 11 +++++++++++
 data/templates/container/systemd-unit.j2    | 17 -----------------
 3 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 data/templates/container/quadlet-network.j2
 create mode 100644 data/templates/container/quadlet-unit.j2
 delete mode 100644 data/templates/container/systemd-unit.j2

(limited to 'data')

diff --git a/data/templates/container/quadlet-network.j2 b/data/templates/container/quadlet-network.j2
new file mode 100644
index 000000000..f253be557
--- /dev/null
+++ b/data/templates/container/quadlet-network.j2
@@ -0,0 +1,8 @@
+### Autogenerated by container.py ###
+[Unit]
+Description=VyOS Network {{ name }}
+
+[Network]
+{% for opt in opts %}
+{{ opt }}
+{% endfor %}
diff --git a/data/templates/container/quadlet-unit.j2 b/data/templates/container/quadlet-unit.j2
new file mode 100644
index 000000000..7546e3f1f
--- /dev/null
+++ b/data/templates/container/quadlet-unit.j2
@@ -0,0 +1,11 @@
+### Autogenerated by container.py ###
+[Unit]
+Description=VyOS Container {{ name }}
+
+[Container]
+{% for opt in opts %}
+{{ opt }}
+{% endfor %}
+
+[Service]
+Restart={{ restart }}
diff --git a/data/templates/container/systemd-unit.j2 b/data/templates/container/systemd-unit.j2
deleted file mode 100644
index d379f0a07..000000000
--- a/data/templates/container/systemd-unit.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-### Autogenerated by container.py ###
-[Unit]
-Description=VyOS Container {{ name }}
-
-[Service]
-Environment=PODMAN_SYSTEMD_UNIT=%n
-Restart=on-failure
-ExecStartPre=/bin/rm -f %t/%n.pid %t/%n.cid
-ExecStart=/usr/bin/podman run \
-        --conmon-pidfile %t/%n.pid --cidfile %t/%n.cid --cgroups=no-conmon \
-        {{ run_args }}
-ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.cid -t 5
-ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.cid
-ExecStopPost=/bin/rm -f %t/%n.cid
-PIDFile=%t/%n.pid
-KillMode=control-group
-Type=forking
-- 
cgit v1.2.3