From 392edab8087d0940ad1d33810b5b3c6b0b06c191 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Jul 02 2014 13:49:08 +0000 Subject: disable the mirrorlist options till we can workout how to best implement it on our side --- diff --git a/SOURCES/anaconda-centos-disable-mirrors.patch b/SOURCES/anaconda-centos-disable-mirrors.patch new file mode 100644 index 0000000..fc27b78 --- /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/SPECS/anaconda.spec b/SPECS/anaconda.spec index 788ee6a..49eb73e 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -18,6 +18,7 @@ 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 +Patch1004: anaconda-centos-disable-mirrors.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -195,6 +196,7 @@ runtime on NFS/HTTP/FTP servers or local disks. %patch1001 -p1 %patch1002 -p1 %patch1003 -p1 +%patch1004 -p1 %build %configure --disable-static \ @@ -267,6 +269,10 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Jul 2 2014 Karanbir Singh - 19.31.79.1.el7.centos.4 +- trim unneeded whitespace from branding patch +- skip the mirrorlist section till we can build an api at our end around it + * 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