diff options
| author | Alberto Contreras <alberto.contreras@canonical.com> | 2023-02-24 10:06:28 +0100 |
|---|---|---|
| committer | Alberto Contreras <alberto.contreras@canonical.com> | 2023-02-24 10:26:19 +0100 |
| commit | f4da14f432fd4548cbbc736142edbdd209a64b48 (patch) | |
| tree | 54f4d3b830e0deeb87a9b72c886c8e2837853ee6 | |
| parent | f4c0b2b2c12f29438c6b8e50a331056bc5891734 (diff) | |
| download | cloud-init-git-f4da14f432fd4548cbbc736142edbdd209a64b48.tar.gz | |
refresh patches against 23.1
patches:
debian/patches/retain-netplan-world-readable.patch
| -rw-r--r-- | debian/patches/retain-netplan-world-readable.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/debian/patches/retain-netplan-world-readable.patch b/debian/patches/retain-netplan-world-readable.patch index eff11bd6..2e206a41 100644 --- a/debian/patches/retain-netplan-world-readable.patch +++ b/debian/patches/retain-netplan-world-readable.patch @@ -7,10 +7,8 @@ Forwarded: not-needed Last-Update: 2023-01-09 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: cloud-init/cloudinit/features.py -=================================================================== ---- cloud-init.orig/cloudinit/features.py -+++ cloud-init/cloudinit/features.py +--- a/cloudinit/features.py ++++ b/cloudinit/features.py @@ -59,7 +59,7 @@ only non-hashed passwords were expired. (This flag can be removed after Jammy is no longer supported.) """ @@ -20,10 +18,8 @@ Index: cloud-init/cloudinit/features.py """ If ``NETPLAN_CONFIG_ROOT_READ_ONLY`` is True, then netplan configuration will be written as a single root readon-only file /etc/netplan/50-cloud-init.yaml. -Index: cloud-init/tests/unittests/distros/test_netconfig.py -=================================================================== ---- cloud-init.orig/tests/unittests/distros/test_netconfig.py -+++ cloud-init/tests/unittests/distros/test_netconfig.py +--- a/tests/unittests/distros/test_netconfig.py ++++ b/tests/unittests/distros/test_netconfig.py @@ -592,32 +592,41 @@ class TestNetCfgDistroUbuntuNetplan(Test (self.netplan_path(), V1_TO_V2_NET_CFG_OUTPUT, 0o600), ) |