diff --git a/backport-add-Requires-cloud-init-hotplugd.socket-in-cloud-init-hotplugd.service-file.patch b/backport-add-Requires-cloud-init-hotplugd.socket-in-cloud-init-hotplugd.service-file.patch new file mode 100644 index 0000000000000000000000000000000000000000..b5d3bbbc4225e161d0ff0327aa9c86c7d6757af3 --- /dev/null +++ b/backport-add-Requires-cloud-init-hotplugd.socket-in-cloud-init-hotplugd.service-file.patch @@ -0,0 +1,34 @@ +From fca5bb77c251bea6ed7a21e9b9e0b320a01575a9 Mon Sep 17 00:00:00 2001 +From: yangzz-97 <70520104+yangzz-97@users.noreply.github.com> +Date: Fri, 18 Mar 2022 04:12:31 +0800 +Subject: [PATCH] add Requires=cloud-init-hotplugd.socket in + cloud-init-hotplugd.service file (#1335) + +Signed-off-by: yangzz-97 +--- + systemd/cloud-init-hotplugd.service | 1 + + tools/.github-cla-signers | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/systemd/cloud-init-hotplugd.service b/systemd/cloud-init-hotplugd.service +index b64632efe9..10962d549e 100644 +--- a/systemd/cloud-init-hotplugd.service ++++ b/systemd/cloud-init-hotplugd.service +@@ -12,6 +12,7 @@ + [Unit] + Description=cloud-init hotplug hook daemon + After=cloud-init-hotplugd.socket ++Requires=cloud-init-hotplugd.socket + + [Service] + Type=simple +diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers +index e205d6ea32..27352aba73 100644 +--- a/tools/.github-cla-signers ++++ b/tools/.github-cla-signers +@@ -92,4 +92,5 @@ Vultaire + WebSpider + xiachen-rh + xnox ++yangzz-97 + zhuzaifangxuele diff --git a/cloud-init.spec b/cloud-init.spec index 91ebde3108a26797de78fe5b2200e5d868f7e29e..939f7e32381b2f7d4f13cc0f3045c26d47b614ea 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 21.4 -Release: 1 +Release: 2 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -13,6 +13,7 @@ Patch1: cloud-init-20.4-no-override-default-network.patch Patch2: bugfix-cloud-init-add-openEuler-os.patch Patch3: bugfix-sort-requirements.patch Patch4: add-variable-to-forbid-tmp-dir.patch +Patch5: backport-add-Requires-cloud-init-hotplugd.socket-in-cloud-init-hotplugd.service-file.patch Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch @@ -124,6 +125,12 @@ fi %exclude /usr/share/doc/* %changelog +* Fri Mar 18 2022 yangzhuangzhuang - 21.4-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add Requires cloud-init-hotplugd.socket in cloud-init-hotplugd.service file + * Tue Dec 21 2021 yangzhuangzhuang - 21.4-1 - Type:update - ID:NA