diff options
Diffstat (limited to 'recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch')
| -rw-r--r-- | recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch b/recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch index 62f2fb1..9b2a6f3 100644 --- a/recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch +++ b/recipes-installer/anaconda/files/0036-do-not-support-network-setting-for-now.patch @@ -1,7 +1,7 @@ -From e9d4533753f89367b9a30899c1ba239c9d884f8a Mon Sep 17 00:00:00 2001 +From c0faa221bfb713b2287ed2f101285d56f28ba091 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Thu, 1 Jun 2017 13:34:20 +0800 -Subject: [PATCH 36/65] do not support network setting for now +Date: Sat, 29 Jun 2019 12:56:02 +0800 +Subject: [PATCH] do not support network setting for now We have a long term plan to support it, but not now. @@ -9,17 +9,31 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - pyanaconda/installation.py | 3 +++ - pyanaconda/ui/tui/spokes/network.py | 5 +++++ - 2 files changed, 8 insertions(+) + pyanaconda/core/configuration/system.py | 3 ++- + pyanaconda/installation.py | 3 +++ + 2 files changed, 5 insertions(+), 1 deletion(-) +diff --git a/pyanaconda/core/configuration/system.py b/pyanaconda/core/configuration/system.py +index 7459e2e..9b7ef96 100644 +--- a/pyanaconda/core/configuration/system.py ++++ b/pyanaconda/core/configuration/system.py +@@ -135,7 +135,8 @@ class SystemSection(Section): + @property + def can_configure_network(self): + """Can we configure the network?""" +- return self._is_boot_iso or self._is_booted_os ++ # Do not support network config for now ++ return False + + @property + def can_detect_unsupported_hardware(self): diff --git a/pyanaconda/installation.py b/pyanaconda/installation.py -index f1cc401..3672fae 100644 +index 9eb40b3..0423a3d 100644 --- a/pyanaconda/installation.py +++ b/pyanaconda/installation.py -@@ -72,6 +72,9 @@ def _writeKS(ksdata): - if ksdata.method.method == "url" and not ksdata.method.url.startswith("https://"): - ksdata.method.noverifyssl = False +@@ -79,6 +79,9 @@ def _writeKS(ksdata): + auto_part_proxy = STORAGE.get_proxy(AUTO_PARTITIONING) + auto_part_proxy.SetPassphrase("") + # Do not support network configuration + ksdata.network.network = [] @@ -27,22 +41,6 @@ index f1cc401..3672fae 100644 # Make it so only root can read - could have passwords with util.open_with_perm(path, "w", 0o600) as f: f.write(str(ksdata)) -diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py -index a8276e4..b3a4f85 100644 ---- a/pyanaconda/ui/tui/spokes/network.py -+++ b/pyanaconda/ui/tui/spokes/network.py -@@ -67,6 +67,11 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalTUISpoke): - self.errors = [] - self._apply = False - -+ @classmethod -+ def should_run(cls, environment, data): -+ # Do not support network config for now -+ return False -+ - def initialize(self): - self.initialize_start() - self._load_new_devices() -- 2.7.4 |