From 27f2366ec3371ce674ffdb081df04ea1065cc08d Mon Sep 17 00:00:00 2001
From: Alberto Contreras <alberto.contreras@canonical.com>
Date: Mon, 2 Sep 2024 12:12:30 +0200
Subject: [PATCH] fix(systemd): add Before=shutdown.target to
 cloud-init-main.service.tmpl

Fixes lintian warning systemd-service-file-shutdown-problems. See [1,
2].

Remove superflous conditional additions of Conflicts=shutdown.target as
it is unconditionally added for every target.

[1] https://salsa.debian.org/lintian/lintian/-/blob/2.118.0/tags/s/systemd-service-file-shutdown-problems.tag
[2] https://github.com/systemd/systemd/issues/11821
---
 systemd/cloud-init-main.service.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/systemd/cloud-init-main.service.tmpl b/systemd/cloud-init-main.service.tmpl
index 1ddfd62073e..7a9114bb58b 100644
--- a/systemd/cloud-init-main.service.tmpl
+++ b/systemd/cloud-init-main.service.tmpl
@@ -17,16 +17,15 @@ Requires=dbus.socket
 After=dbus.socket
 Before=network.service
 Before=firewalld.target
-Conflicts=shutdown.target
 {% endif %}
 {% if variant in ["ubuntu", "unknown", "debian"] %}
 Before=sysinit.target
-Conflicts=shutdown.target
 {% endif %}
 
 After=systemd-remount-fs.service
 Before=sysinit.target
 Before=cloud-init-local.service
+Before=shutdown.target
 Conflicts=shutdown.target
 RequiresMountsFor=/var/lib/cloud
 ConditionPathExists=!/etc/cloud/cloud-init.disabled