From 1bbe7313a9756ed11b83c1c777c1ebd189cd1823 Mon Sep 17 00:00:00 2001 From: Brett Holman Date: Mon, 5 Aug 2024 16:53:42 -0600 Subject: [PATCH] Add no-nocloud-network.patch --- debian/patches/no-nocloud-network.patch | 26 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) create mode 100644 debian/patches/no-nocloud-network.patch diff --git a/debian/patches/no-nocloud-network.patch b/debian/patches/no-nocloud-network.patch new file mode 100644 index 00000000000..5d3269a4ed4 --- /dev/null +++ b/debian/patches/no-nocloud-network.patch @@ -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 +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 diff --git a/debian/patches/series b/debian/patches/series index 5a6e30ecc6e..1868a18a4d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ deprecation-version-boundary.patch no-single-process.patch +no-nocloud-network.patch