Skip to content

Commit

Permalink
refresh patches against upstream/main
Browse files Browse the repository at this point in the history
patches:
debian/patches/no-nocloud-network.patch
debian/patches/no-single-process.patch
  • Loading branch information
TheRealFalcon committed Aug 7, 2024
1 parent b9db6d9 commit a3e7474
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions debian/patches/no-nocloud-network.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Last-Update: 2024-08-02

--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -190,7 +190,7 @@
@@ -190,7 +190,7 @@ class DataSourceNoCloud(sources.DataSour

# This could throw errors, but the user told us to do it
# so if errors are raised, let them raise
Expand All @@ -16,7 +16,7 @@ Last-Update: 2024-08-02
LOG.debug("Using seeded cache data from %s", seedfrom)

# Values in the command line override those from the seed
@@ -199,7 +199,6 @@
@@ -199,7 +199,6 @@ class DataSourceNoCloud(sources.DataSour
)
mydata["user-data"] = ud
mydata["vendor-data"] = vd
Expand Down
8 changes: 4 additions & 4 deletions debian/patches/no-single-process.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Last-Update: 2024-08-02

--- a/systemd/cloud-config.service.tmpl
+++ b/systemd/cloud-config.service.tmpl
@@ -10,14 +10,7 @@
@@ -10,14 +10,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=clo

[Service]
Type=oneshot
Expand All @@ -24,7 +24,7 @@ Last-Update: 2024-08-02

--- a/systemd/cloud-final.service.tmpl
+++ b/systemd/cloud-final.service.tmpl
@@ -15,16 +15,10 @@
@@ -15,16 +15,10 @@ ConditionEnvironment=!KERNEL_CMDLINE=clo

[Service]
Type=oneshot
Expand All @@ -45,15 +45,15 @@ Last-Update: 2024-08-02
ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
@@ -7,6 +7,7 @@
@@ -7,6 +7,7 @@ DefaultDependencies=no
{% endif %}
Wants=network-pre.target
After=hv_kvp_daemon.service
+After=systemd-remount-fs.service
{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
Requires=dbus.socket
After=dbus.socket
@@ -37,14 +38,7 @@
@@ -37,14 +38,7 @@ ExecStartPre=/bin/mkdir -p /run/cloud-in
ExecStartPre=/sbin/restorecon /run/cloud-init
ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
{% endif %}
Expand Down

0 comments on commit a3e7474

Please sign in to comment.