From 6e9189a8d8a03dcc01650ca56556bafa368bc3d9 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: May 01 2020 13:48:51 +0000 Subject: disable the subscription/CDN button --- diff --git a/SOURCES/0003-disable-subscription-button.patch b/SOURCES/0003-disable-subscription-button.patch new file mode 100644 index 0000000..daa3ea5 --- /dev/null +++ b/SOURCES/0003-disable-subscription-button.patch @@ -0,0 +1,88 @@ +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 @@ + + + +- +- Red Hat _CDN +- True +- True ++ ++ False ++ False ++ False + False + 12 + True + 0 +- True +- True +- isoRadioButton ++ False ++ False + + + False +- True +- 4 ++ False + + + +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() + diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 671581b..d6f7168 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -22,6 +22,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch100: centos-l10n.patch Patch101: 0001-disable-subscription-spoke.py Patch102: 0002-add-centos-background-color.patch +Patch103: 0003-disable-subscription-button.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things).