|
 |
629de0 |
From 6b70a1867fef732cd75ef79782f71c13241622b7 Mon Sep 17 00:00:00 2001
|
|
|
629de0 |
From: Colin Walters <walters@verbum.org>
|
|
|
629de0 |
Date: Fri, 12 Jun 2015 13:59:05 -0400
|
|
|
629de0 |
Subject: [PATCH] Use CentOS branding, increase install priority for Atomic
|
|
|
629de0 |
|
|
|
629de0 |
This is similar to the patch CentOS normally applies to Anaconda,
|
|
|
629de0 |
but updated for Atomic.
|
|
|
629de0 |
---
|
|
|
629de0 |
pyanaconda/installclasses/rhel.py | 17 +++++++++++------
|
|
|
629de0 |
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
629de0 |
|
|
|
629de0 |
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
|
|
|
629de0 |
index a9a99f6..b924cd2 100644
|
|
|
629de0 |
--- a/pyanaconda/installclasses/rhel.py
|
|
|
629de0 |
+++ b/pyanaconda/installclasses/rhel.py
|
|
|
629de0 |
@@ -30,9 +30,9 @@ from blivet.platform import platform
|
|
|
629de0 |
from blivet.devicelibs import swap
|
|
|
629de0 |
|
|
|
629de0 |
class RHELBaseInstallClass(BaseInstallClass):
|
|
|
629de0 |
- name = "Red Hat Enterprise Linux"
|
|
|
629de0 |
+ name = "CentOS Linux"
|
|
|
629de0 |
sortPriority = 20000
|
|
|
629de0 |
- if not productName.startswith("Red Hat "):
|
|
|
629de0 |
+ if not productName.startswith("CentOS "):
|
|
|
629de0 |
hidden = True
|
|
|
629de0 |
defaultFS = "xfs"
|
|
|
629de0 |
|
|
|
629de0 |
@@ -45,7 +45,7 @@ class RHELBaseInstallClass(BaseInstallClass):
|
|
|
629de0 |
|
|
|
629de0 |
_l10n_domain = "comps"
|
|
|
629de0 |
|
|
|
629de0 |
- efi_dir = "redhat"
|
|
|
629de0 |
+ efi_dir = "centos"
|
|
|
629de0 |
|
|
|
629de0 |
def configure(self, anaconda):
|
|
|
629de0 |
BaseInstallClass.configure(self, anaconda)
|
|
|
629de0 |
@@ -90,9 +90,14 @@ class RHELBaseInstallClass(BaseInstallClass):
|
|
|
629de0 |
BaseInstallClass.__init__(self)
|
|
|
629de0 |
|
|
|
629de0 |
class RHELAtomicInstallClass(RHELBaseInstallClass):
|
|
|
629de0 |
- name = "RHEL Atomic Host"
|
|
|
629de0 |
- if productName.startswith("RHEL Atomic"):
|
|
|
629de0 |
- hidden = False
|
|
|
629de0 |
+ name = "CentOS Atomic Host"
|
|
|
629de0 |
+ # We have to bump priority because RHEL upstream is relying on a
|
|
|
629de0 |
+ # side effect of the OS name starting with "RHEL" instead of "Red
|
|
|
629de0 |
+ # Hat" and thus the normal RHELBaseInstallClass above not
|
|
|
629de0 |
+ # matching.
|
|
|
629de0 |
+ sortPriority = 20001
|
|
|
629de0 |
+ if not productName.startswith("CentOS "):
|
|
|
629de0 |
+ hidden = True
|
|
|
629de0 |
|
|
|
629de0 |
def setDefaultPartitioning(self, storage):
|
|
|
629de0 |
autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
|
|
|
629de0 |
--
|
|
|
629de0 |
1.8.3.1
|
|
|
629de0 |
|