-
Notifications
You must be signed in to change notification settings - Fork 881
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ cloud-init (24.2-0ubuntu1~24.04.2) UNRELEASED; urgency=medium | |
|
||
* Upstream snapshot based on upstream/main at b7b11bc0. | ||
* d/p/no-single-process.patch: Remove single process optimization | ||
* d/p/no-nocloud-network.patch: Remove nocloud network feature | ||
|
||
-- Brett Holman <[email protected]> Mon, 05 Aug 2024 11:56:59 -0600 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |