Skip to content

Commit

Permalink
Add no-nocloud-network.patch
Browse files Browse the repository at this point in the history
  • Loading branch information
holmanb committed Aug 2, 2024
1 parent 6b5b5c3 commit 374beb0
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
1 change: 1 addition & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cloud-init (24.2-0ubuntu1~24.04.2) UNRELEASED; urgency=medium

* Upstream snapshot based on upstream/main at 143bc9e4.
* d/p/no-single-process.patch: Remove single process optimization
* d/p/no-nocloud-network.patch: Remove nocloud network feature

-- Brett Holman <[email protected]> Fri, 02 Aug 2024 15:32:10 -0600

Expand Down
26 changes: 26 additions & 0 deletions debian/patches/no-nocloud-network.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Description: Don't allow network-config
This may add a new wait time for a file that doesn't exist on existing series
so patch it out.

Author: Brett Holman <[email protected]>
Last-Update: 2024-08-02

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

# This could throw errors, but the user told us to do it
# so if errors are raised, let them raise
- md_seed, ud, vd, network = util.read_seeded(seedfrom, timeout=None)
+ md_seed, ud, vd, _ = util.read_seeded(seedfrom, timeout=None)
LOG.debug("Using seeded cache data from %s", seedfrom)

# Values in the command line override those from the seed
@@ -199,7 +199,6 @@
)
mydata["user-data"] = ud
mydata["vendor-data"] = vd
- mydata["network-config"] = network
found.append(seedfrom)

# Now that we have exhausted any other places merge in the defaults
1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
deprecation-version-boundary.patch
no-single-process.patch
no-nocloud-network.patch

0 comments on commit 374beb0

Please sign in to comment.