[master/rhel7-branch] Set mandatory property in network tui spoke. (#1064139)

Samantha N. Bueno sbueno+anaconda at redhat.com
Fri Feb 14 15:35:28 UTC 2014


This reverts commit 9d312582 and employs a more correct fix that
is also present in the graphical logic -- determining whether
network configuration should be mandatory based on the installation
source method.

Resolves: rhbz#1064139
---
 pyanaconda/ui/tui/spokes/network.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py
index c0d11ab..8fc3d63 100644
--- a/pyanaconda/ui/tui/spokes/network.py
+++ b/pyanaconda/ui/tui/spokes/network.py
@@ -68,9 +68,15 @@ class NetworkSpoke(EditTUISpoke):
             check if we're installing from CD/DVD, since a network connection
             should not be required in this case.
         """
-        localinst = bool(self.data.method.method == "cdrom")
         return (not can_touch_runtime_system("require network connection")
-                or nm_activated_devices() or localinst)
+                or nm_activated_devices())
+
+    @property
+    def mandatory(self):
+        """ This spoke should only be necessary if we're using an installation
+            source that requires a network connection.
+        """
+        return self.data.method.method in ("url", "nfs")
 
     @property
     def status(self):
-- 
1.8.3.1



More information about the anaconda-patches mailing list