diff options
Diffstat (limited to '')
| -rw-r--r-- | net/cloud-init/files/extra-cloudinit_distros_freebsd.py | 2 | ||||
| -rw-r--r-- | net/cloud-init/files/extra-cloudinit_netinfo.py | 11 | ||||
| -rw-r--r-- | net/cloud-init/files/patch-cloudinit_settings.py | 16 | ||||
| -rw-r--r-- | net/cloud-init/files/patch-setup.py | 6 |
4 files changed, 27 insertions, 8 deletions
diff --git a/net/cloud-init/files/extra-cloudinit_distros_freebsd.py b/net/cloud-init/files/extra-cloudinit_distros_freebsd.py index eb4d375a49fd..c14b672d5cc6 100644 --- a/net/cloud-init/files/extra-cloudinit_distros_freebsd.py +++ b/net/cloud-init/files/extra-cloudinit_distros_freebsd.py @@ -1,4 +1,4 @@ ---- cloudinit/distros/freebsd.py.orig 2024-10-25 15:58:28 UTC +--- cloudinit/distros/freebsd.py.orig 2025-08-12 19:00:58 UTC +++ cloudinit/distros/freebsd.py @@ -35,7 +35,7 @@ class Distro(cloudinit.distros.bsd.BSD): pkg_cmd_update_prefix = ["pkg", "update"] diff --git a/net/cloud-init/files/extra-cloudinit_netinfo.py b/net/cloud-init/files/extra-cloudinit_netinfo.py new file mode 100644 index 000000000000..d756dda563f0 --- /dev/null +++ b/net/cloud-init/files/extra-cloudinit_netinfo.py @@ -0,0 +1,11 @@ +--- cloudinit/netinfo.py.orig 2025-09-01 15:44:21 UTC ++++ cloudinit/netinfo.py +@@ -558,7 +558,7 @@ def route_info(): + elif subp.which("netstat"): + # Fall back to net-tools if iproute2 is not present + (route_out, _err) = subp.subp( +- ["netstat", "--route", "--numeric", "--extend"], rcs=[0, 1] ++ ["netstat", "--route", "--numeric", "--extend"], rcs=[0, 1, 64] + ) + routes = _netdev_route_info_netstat(route_out) + else: diff --git a/net/cloud-init/files/patch-cloudinit_settings.py b/net/cloud-init/files/patch-cloudinit_settings.py index d7ca2bd87f2c..a2aded75780a 100644 --- a/net/cloud-init/files/patch-cloudinit_settings.py +++ b/net/cloud-init/files/patch-cloudinit_settings.py @@ -1,19 +1,27 @@ ---- cloudinit/settings.py.orig 2021-03-17 15:43:42 UTC +--- cloudinit/settings.py.orig 2025-08-12 19:00:58 UTC +++ cloudinit/settings.py -@@ -12,7 +12,7 @@ +@@ -12,11 +12,11 @@ CFG_ENV_NAME = "CLOUD_CFG" CFG_ENV_NAME = "CLOUD_CFG" # This is expected to be a yaml formatted file -CLOUD_CONFIG = "/etc/cloud/cloud.cfg" +CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg" - RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg" +-CLEAN_RUNPARTS_DIR = "/etc/cloud/clean.d" ++CLEAN_RUNPARTS_DIR = "%%PREFIX%%/etc/cloud/clean.d" -@@ -50,7 +50,7 @@ CFG_BUILTIN = { +-DEFAULT_RUN_DIR = "/run/cloud-init" ++DEFAULT_RUN_DIR = "/var/run/cloud-init" + + # What u get if no config is provided + CFG_BUILTIN = { +@@ -60,8 +60,8 @@ CFG_BUILTIN = { "system_info": { "paths": { "cloud_dir": "/var/lib/cloud", +- "docs_dir": "/usr/share/doc/cloud-init/", - "templates_dir": "/etc/cloud/templates/", ++ "docs_dir": "%%PREFIX%%/share/doc/cloud-init/", + "templates_dir": "%%PREFIX%%/etc/cloud/templates/", }, "distro": "ubuntu", diff --git a/net/cloud-init/files/patch-setup.py b/net/cloud-init/files/patch-setup.py index c94715dc97c6..403683645cf7 100644 --- a/net/cloud-init/files/patch-setup.py +++ b/net/cloud-init/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2021-03-17 15:40:30 UTC +--- setup.py.orig 2025-08-12 19:00:58 UTC +++ setup.py -@@ -153,7 +153,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in I +@@ -176,7 +176,7 @@ USR = "usr" # Install everything in the right location and take care of Linux (default) and # FreeBSD systems. USR = "usr" @@ -8,4 +8,4 @@ +ETC = "%%PREFIX%%/etc" USR_LIB_EXEC = "usr/lib" LIB = "lib" - if os.uname()[0] in ["FreeBSD", "DragonFly"]: + if os.uname()[0] in ["FreeBSD", "DragonFly", "OpenBSD"]: |