From 40a3b93d5bf172a7599c19a547951790bfa677b2 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Tue, 4 Feb 2025 13:47:34 -0700 Subject: [PATCH 1/2] wait for mounts --- debian/patches/no-single-process.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/patches/no-single-process.patch b/debian/patches/no-single-process.patch index 5f1e160769a..fde167c1be3 100644 --- a/debian/patches/no-single-process.patch +++ b/debian/patches/no-single-process.patch @@ -53,7 +53,15 @@ Last-Update: 2024-08-02 Before=network-pre.target Before=shutdown.target {% if variant in ["almalinux", "cloudlinux", "rhel"] %} -@@ -25,14 +26,7 @@ Type=oneshot +@@ -16,6 +17,7 @@ + Before=sysinit.target + {% endif %} + Conflicts=shutdown.target ++RequiresMountsFor=/var/lib/cloud + ConditionPathExists=!/etc/cloud/cloud-init.disabled + ConditionKernelCommandLine=!cloud-init=disabled + ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled +@@ -25,14 +27,7 @@ {% if variant in ["almalinux", "cloudlinux", "rhel"] %} ExecStartPre=/sbin/restorecon /run/cloud-init {% endif %} From c65a7610ec18bfdcb9799ea2a1dd3604fd08828a Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Tue, 4 Feb 2025 13:51:56 -0700 Subject: [PATCH 2/2] update changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d48dfd5536a..518de7ec68c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ cloud-init (25.1-0ubuntu1~24.04.1) UNRELEASED; urgency=medium * Update d/p/no-single-process.patch + - This patch missed waiting for mounts (LP: #2097441) + - Fix upstream conflict -- Brett Holman Mon, 06 Jan 2024 17:39:42 -0700