From e8bece27bdfe42ffbd88099d55018779865a6881 Mon Sep 17 00:00:00 2001
From: Karanbir Singh <kbsingh@karan.org>
Date: Mar 23 2015 19:10:10 +0000
Subject: Patch in CentOS requirements for 1503


---

diff --git a/SOURCES/anaconda-centos-add-centos-install-class.patch b/SOURCES/anaconda-centos-add-centos-install-class.patch
index 242ff46..89d64b5 100644
--- a/SOURCES/anaconda-centos-add-centos-install-class.patch
+++ b/SOURCES/anaconda-centos-add-centos-install-class.patch
@@ -98,7 +98,7 @@ diff -uNr anaconda-19.31.79__orig/pyanaconda/installclasses/fedora.py anaconda-1
      name = N_("_Fedora")
      sortPriority = 10000
 -    if productName.startswith("Red Hat "):
-+    if productName.startswith("Red Hat ") or productName.startswith("CentOS "):
++    if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
          hidden = 1
  
      _l10n_domain = "anaconda"
diff --git a/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch b/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch
new file mode 100644
index 0000000..31432af
--- /dev/null
+++ b/SOURCES/anaconda-centos-bootfs-default-to-xfs.patch
@@ -0,0 +1,21 @@
+diff -uNr anaconda-19.31.79__orig/pyanaconda/bootloader.py anaconda-19.31.79/pyanaconda/bootloader.py
+--- anaconda-19.31.79__orig/pyanaconda/bootloader.py	2014-04-29 01:45:59.000000000 +0100
++++ anaconda-19.31.79/pyanaconda/bootloader.py	2014-06-30 17:19:19.197386280 +0100
+@@ -1404,7 +1404,7 @@
+ 
+     @property
+     def stage2_format_types(self):
+-        if productName.startswith("Red Hat "):
++        if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
+             return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
+         else:
+             return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
+@@ -2063,7 +2063,7 @@
+ 
+     @property
+     def stage2_format_types(self):
+-        if productName.startswith("Red Hat "):
++        if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
+             return ["xfs", "ext4", "ext3", "ext2"]
+         else:
+             return ["ext4", "ext3", "ext2", "xfs"]
diff --git a/SOURCES/anaconda-centos-disable-mirrors.patch b/SOURCES/anaconda-centos-disable-mirrors.patch
new file mode 100644
index 0000000..fb5b2eb
--- /dev/null
+++ b/SOURCES/anaconda-centos-disable-mirrors.patch
@@ -0,0 +1,15 @@
+diff -uNr anaconda-19.31.79__orig/pyanaconda/packaging/yumpayload.py anaconda-19.31.79/pyanaconda/packaging/yumpayload.py
+--- anaconda-19.31.79__orig/pyanaconda/packaging/yumpayload.py	2014-04-29 01:45:59.000000000 +0100
++++ anaconda-19.31.79/pyanaconda/packaging/yumpayload.py	2014-07-02 14:36:15.360488588 +0100
+@@ -428,7 +428,10 @@
+     @property
+     def mirrorEnabled(self):
+         with _yum_lock:
+-            return "fastestmirror" in self._yum.plugins._plugins
++            if productName.startswith("CentOS"):
++                return 0
++            else:
++                return "fastestmirror" in self._yum.plugins._plugins
+ 
+     def getRepo(self, repo_id):
+         """ Return the yum repo object. """
diff --git a/SOURCES/anaconda-centos-efidir-centos.patch b/SOURCES/anaconda-centos-efidir-centos.patch
new file mode 100644
index 0000000..79d58f7
--- /dev/null
+++ b/SOURCES/anaconda-centos-efidir-centos.patch
@@ -0,0 +1,12 @@
+diff -uNr anaconda-19.31.79__orig/pyanaconda/installclasses/centos.py anaconda-19.31.79/pyanaconda/installclasses/centos.py
+--- anaconda-19.31.79__orig/pyanaconda/installclasses/centos.py	2014-06-30 17:13:18.111386761 +0100
++++ anaconda-19.31.79/pyanaconda/installclasses/centos.py	2014-06-30 17:13:43.071386726 +0100
+@@ -43,7 +43,7 @@
+ 
+     _l10n_domain = "comps"
+ 
+-    efi_dir = "redhat"
++    efi_dir = "centos"
+ 
+     def configure(self, anaconda):
+         BaseInstallClass.configure(self, anaconda)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 503c222..57c80da 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -4,8 +4,11 @@ Summary: Graphical system installer
 Name:    anaconda
 Patch1:	anaconda-centos-add-centos-install-class.patch
 Patch2:	anaconda-centos-set-right-eula-location.patch
+Patch3: anaconda-centos-efidir-centos.patch
+Patch4: anaconda-centos-disable-mirrors.patch
+Patch5: anaconda-centos-bootfs-default-to-xfs.patch
 Version: 19.31.123
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -233,6 +236,9 @@ This package hold the content for the Anaconda built-in help system.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 %setup -a 1
 
 %build
@@ -331,6 +337,9 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/anaconda/help/*
 
 %changelog
+* Fri Mar 20 2015 Karanbir Singh <kbsingh@centos.org> - 19.31.123-1.el7.centos.1
+- Add path to restore installclass, set EULA path, ensure xfs as default
+
 * Thu Mar 05 2015 CentOS Sources <bugs@centos.org> - 19.31.123-1.el7.centos
 - Add CentOS install class as default
 - use the right path for the EULA string (issue 7165,  bstinson)