diff --git a/0001-add-fedora-repos-anaconda-to-runtime-environment.patch b/0001-add-fedora-repos-anaconda-to-runtime-environment.patch new file mode 100644 index 0000000..68d818f --- /dev/null +++ b/0001-add-fedora-repos-anaconda-to-runtime-environment.patch @@ -0,0 +1,34 @@ +From bc9b40f18f85f85aedea0a9a53a126815000c669 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 15 Sep 2014 11:59:09 -0700 +Subject: [PATCH] add fedora-repos-anaconda to runtime environment + +This is a virtual provides that should install the product specific yum +repo files in /etc/yum.repos.d/ with the one matching the product name +enabled. Eg. fedora-server.repo with an id of fedora-server and +enabled=1 + +Anaconda will then use this repository when 'Closest Mirror' is selected +as the installation source. + +Signed-off-by: Brian C. Lane +--- + share/runtime-install.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl +index f0a1e32..61b1d80 100644 +--- a/share/runtime-install.tmpl ++++ b/share/runtime-install.tmpl +@@ -7,6 +7,8 @@ installpkg kexec-tools-anaconda-addon + ## anaconda deps that aren't in the RPM + installpkg tmux + installpkg iscsi-initiator-utils ++## needed for product-ized installs to find correct frozen repos ++installpkg fedora-repos-anaconda + ## Other available payloads + installpkg dnf + installpkg rpm-ostree +-- +1.9.3 + diff --git a/lorax.spec b/lorax.spec index a457212..90b852f 100644 --- a/lorax.spec +++ b/lorax.spec @@ -2,7 +2,7 @@ Name: lorax Version: 21.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -10,6 +10,8 @@ License: GPLv2+ URL: http://git.fedorahosted.org/git/?p=lorax.git Source0: https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.gz +Patch0: 0001-add-fedora-repos-anaconda-to-runtime-environment.patch + BuildRequires: python2-devel Requires: GConf2 @@ -77,6 +79,7 @@ Anaconda's image install feature. %prep %setup -q +%patch0 -p1 -b .repos %build @@ -101,6 +104,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_mandir}/man1/*.1* %changelog +* Mon Sep 15 2014 Brian C. Lane 21.21-2 +- add fedora repos anaconda to runtime environment + * Thu Aug 28 2014 Brian C. Lane 21.21-1 - Revert "Require 32bit glibc on ppc64" (bcl@redhat.com) - livemedia-creator: Update ppc64 live to use grub2 (bcl@redhat.com)