From f5cbb36b8627fe64a8d5b56f15e6a16a4d33f498 Mon Sep 17 00:00:00 2001
From: James Falcon <therealfalcon@gmail.com>
Date: Thu, 3 Jul 2025 10:34:40 -0500
Subject: [PATCH] fix: Remove cloud-final.service regression

After=multi-user.target can cause issues on non-debian systems,
so ensure it is templated

Fixes GH-6245
---
 systemd/cloud-final.service | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service
index fb74a47c8eb..ab1203af1a7 100644
--- a/systemd/cloud-final.service
+++ b/systemd/cloud-final.service
@@ -1,8 +1,11 @@
+## template:jinja
 [Unit]
 # https://docs.cloud-init.io/en/latest/explanation/boot.html
 Description=Cloud-init: Final Stage
 After=network-online.target time-sync.target cloud-config.service rc-local.service
+{% if variant in ["ubuntu", "unknown", "debian"] %}
 After=multi-user.target
+{% endif %}
 Before=apt-daily.service
 Wants=network-online.target cloud-config.service
 ConditionPathExists=!/etc/cloud/cloud-init.disabled