diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.glade anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.glade
--- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.glade 2019-12-13 07:20:46.000000000 -0600
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.glade 2020-05-01 08:41:17.708599295 -0500
@@ -637,22 +637,20 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="cdnRadioButton">
- <property name="label" translatable="yes" context="GUI|Software Source">Red Hat _CDN</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <object class="GtkWidget" id="cdnRadioButton">
+ <property name="sensitive">False</property>
+ <property name="visible">False</property>
+ <property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">isoRadioButton</property>
+ <property name="active">False</property>
+ <property name="draw_indicator">False</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
diff -uNrp anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.py anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py
--- anaconda-29.19.2.17.orig/pyanaconda/ui/gui/spokes/installation_source.py 2020-02-20 11:12:01.000000000 -0600
+++ anaconda-29.19.2.17/pyanaconda/ui/gui/spokes/installation_source.py 2020-05-01 08:39:51.268940582 -0500
@@ -655,9 +655,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
- method is None
- the RedHatCDNEnabled hint needs to be True
"""
- method_set = self.data.method.method is not None
- cdn_enabled = self._payload_module.proxy.RedHatCDNEnabled
- return cdn_enabled and not method_set
+ return False
@property
def completed(self):
@@ -831,7 +829,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
payloadMgr.addListener(payloadMgr.STATE_ERROR, self._payload_error)
# default to Red Hat CDN if no method has been specified
- if not self.data.method.method:
+ if False:
log.debug("source spoke: no method set during initialization, enabling CDN")
self._cdnButton.set_active(True)
# Clear the manual flag that unfortunately also gets triggered
@@ -1009,7 +1007,7 @@ class SourceSpoke(NormalSpoke, GUISpokeI
# Set CDN radio button active, in case external conditions
# changed since the last refresh.
- if self.cdn_used_as_installation_source and not self._cdnButton.get_active():
+ if False:
log.debug("source spoke: CDN enabled, enabling CDN button")
self._cdnButton.set_active(True)
elif self.data.method.method == "url":
@@ -1059,19 +1057,17 @@ class SourceSpoke(NormalSpoke, GUISpokeI
# guess. Try to autodetect media if that was provided, and then
# fall back to Red Hat CDN.
autodetect_on = not self._autodetectButton.get_no_show_all()
- cdn_in_use = self.cdn_used_as_installation_source
+ cdn_in_use = False
if autodetect_on and not cdn_in_use:
self._autodetectButton.set_active(True)
self.data.method.method = "cdrom"
log.debug("source spoke: CDN not enabled & no other method found, enabling cdrom")
- elif not self._cdnButton.get_active():
- log.debug("source spoke: CDN enabled, enabling CDN button")
+ else:
# NOTE: we already do something similar at the start of the method, but we need
# to do it again as some of the calls in between might have side effects
# that could result in CDN and/or the button being turned on/off
- self._cdnButton.set_active(True)
+ self._networkButton.set_active(True)
self.data.method.method = None
- self._update_CDN_usage()
self._setup_no_updates()