From af328a24903b2615ffb0b536a9484657b1173f5a Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jul 03 2019 14:31:50 +0000 Subject: modify centos install class --- diff --git a/SOURCES/anaconda-centos-really-add-centos-install-class.patch b/SOURCES/anaconda-centos-really-add-centos-install-class.patch new file mode 100644 index 0000000..63ab28b --- /dev/null +++ b/SOURCES/anaconda-centos-really-add-centos-install-class.patch @@ -0,0 +1,43 @@ +diff -aurp a/pyanaconda/installclasses/centos.py b/pyanaconda/installclasses/centos.py +--- a/pyanaconda/installclasses/centos.py 2019-05-31 19:04:29.202239897 -0300 ++++ b/pyanaconda/installclasses/centos.py 2019-05-31 19:01:14.000000000 -0300 +@@ -36,9 +36,9 @@ __all__ = ["RHELBaseInstallClass", "RHEL + + + class RHELBaseInstallClass(BaseInstallClass): +- name = "Red Hat Enterprise Linux" +- sortPriority = 20000 +- if not productName.startswith("Red Hat "): ++ name = "CentOS Linux" ++ sortPriority = 20001 ++ if not productName.startswith("CentOS"): + hidden = True + defaultFS = "xfs" + +@@ -50,10 +50,10 @@ class RHELBaseInstallClass(BaseInstallCl + + _l10n_domain = "comps" + +- efi_dir = "redhat" ++ efi_dir = "centos" + +- help_placeholder = "RHEL7Placeholder.html" +- help_placeholder_with_links = "RHEL7PlaceholderWithLinks.html" ++ help_placeholder = "CentOSPlaceholder.html" ++ help_placeholder_with_links = "CentOSPlaceholderWithLinks.html" + + def configure(self, anaconda): + BaseInstallClass.configure(self, anaconda) +@@ -76,9 +76,9 @@ class RHELBaseInstallClass(BaseInstallCl + BaseInstallClass.__init__(self) + + class RHELAtomicInstallClass(RHELBaseInstallClass): +- name = "Red Hat Enterprise Linux Atomic Host" +- sortPriority=21000 +- hidden = not productName.startswith(("RHEL Atomic Host", "Red Hat Enterprise Linux Atomic")) ++ name = "CentOS Atomic Host" ++ sortPriority=21001 ++ hidden = not productName.startswith(("CentOS Atomic Host", "CentOS Linux Atomic")) + + def __init__(self): + self.localemap = {} # loaded lazily diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 25433f5..862a88f 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 21.48.22.147 -Release: 1%{?dist} +Release: 1%{?dist}.0.1 License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -23,6 +23,7 @@ Patch7: anaconda-centos-skip-retry-if-not-connected.patch Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch Patch9: yumpayload-dont-verify-disabled-repos.patch Patch10: anaconda-centos-armhfp-extloader.patch +Patch11: anaconda-centos-really-add-centos-install-class.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -341,6 +342,9 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jul 03 2019 Johnny Hughes - 21.48.22.147-1.el7.centos.0.1 +- modify CentOS Install Class + * Tue Oct 30 2018 CentOS Sources - 21.48.22.147-1.el7.centos - Add CentOS install class as default - use the right path for the EULA string (issue 7165, bstinson)