From a161942e15bd13c1edc5a7db2abdeb3b75ae6280 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Jun 30 2014 16:21:24 +0000 Subject: make efidir be centos, make boot part fs default to xfs --- 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..18edadc --- /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 prodctName.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-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 2aa1f84..788ee6a 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -3,7 +3,7 @@ Summary: Graphical system installer Name: anaconda Version: 19.31.79 -Release: 1%{?dist}.2 +Release: 1%{?dist}.3 License: GPLv2+ Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -16,6 +16,8 @@ URL: http://fedoraproject.org/wiki/Anaconda Source0: %{name}-%{version}.tar.bz2 Patch1000: anaconda-centos-add-centos-install-class.patch Patch1001: anaconda-centos-set-right-eula-location.patch +Patch1002: anaconda-centos-efidir-centos.patch +Patch1003: anaconda-centos-bootfs-default-to-xfs.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -191,6 +193,8 @@ runtime on NFS/HTTP/FTP servers or local disks. %setup -q %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 %build %configure --disable-static \ @@ -263,6 +267,10 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Jun 30 2014 Karanbir Singh - 19.31.79-1.el7.centos.3 +- make efidir be centos to match grub2's payload +- make boot part fs default to xfs + * Wed Jun 18 2014 Karanbir Singh - 19.31.79-1.el7.centos.2 - make centos.py the default installclass if its not RHEL/Fedora being built - use the right path for the EULA string ( #7165 bstinson )