forked from pool/cloud-init
- Add cloud-init-no-nmcfg-needed.patch (bsc#1221726)
+ Do not require a NetworkManager config file in order to detect NetworkManager as the renderer OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=229
This commit is contained in:
parent
8513308875
commit
c9dc72d3d4
27
cloud-init-no-nmcfg-needed.patch
Normal file
27
cloud-init-no-nmcfg-needed.patch
Normal file
@ -0,0 +1,27 @@
|
||||
--- cloudinit/net/network_manager.py.orig
|
||||
+++ cloudinit/net/network_manager.py
|
||||
@@ -9,7 +9,6 @@
|
||||
import configparser
|
||||
import io
|
||||
import itertools
|
||||
-import os
|
||||
import uuid
|
||||
from typing import Optional
|
||||
|
||||
@@ -401,7 +400,6 @@ def available(target=None):
|
||||
# It is imported here to avoid circular import
|
||||
from cloudinit.distros import uses_systemd
|
||||
|
||||
- config_present = os.path.isfile(subp.target_path(target, path=NM_CFG_FILE))
|
||||
nmcli_present = subp.which("nmcli", target=target)
|
||||
service_active = True
|
||||
if uses_systemd():
|
||||
@@ -410,7 +408,7 @@ def available(target=None):
|
||||
except subp.ProcessExecutionError:
|
||||
service_active = False
|
||||
|
||||
- return config_present and bool(nmcli_present) and service_active
|
||||
+ return bool(nmcli_present) and service_active
|
||||
|
||||
|
||||
# vi: ts=4 expandtab
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 5 18:01:39 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
|
||||
|
||||
- Add cloud-init-no-nmcfg-needed.patch (bsc#1221726)
|
||||
+ Do not require a NetworkManager config file in order to detect
|
||||
NetworkManager as the renderer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 5 14:27:16 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
|
||||
|
||||
|
@ -47,6 +47,8 @@ Patch10: cloud-init-skip-empty-conf.patch
|
||||
Patch11: cloud-init-ds-deterministic.patch
|
||||
# FIXME https://github.com/canonical/cloud-init/issues/5152 adn LP#1715241
|
||||
Patch12: cloud-init-no-openstack-guess.patch
|
||||
# FIXME upstream comit 812df5038
|
||||
Patch13: cloud-init-no-nmcfg-needed.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: filesystem
|
||||
# pkg-config is needed to find correct systemd unit dir
|
||||
@ -157,6 +159,7 @@ Documentation and examples for cloud-init tools
|
||||
%patch -P 10
|
||||
%patch -P 11
|
||||
%patch -P 12
|
||||
%patch -P 13
|
||||
|
||||
# patch in the full version to version.py
|
||||
version_pys=$(find . -name version.py -type f)
|
||||
|
Loading…
Reference in New Issue
Block a user