Add patch

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

.gitignore

@@ -112,3 +112,6 @@
 /anaconda-27.18.tar.bz2
 /anaconda-27.19.tar.bz2
 /anaconda-27.20.tar.bz2
+/anaconda-27.20.1.tar.bz2
+/anaconda-27.20.2.tar.bz2
+/anaconda-27.20.4.tar.bz2

0001-network-create-default-ifcfg-also-for-missing-defaul.patch

@@ -0,0 +1,44 @@
+From 993e85f0a061c920f86905c5acfd91b4846c4de6 Mon Sep 17 00:00:00 2001
+From: Radek Vykydal <rvykydal@redhat.com>
+Date: Tue, 17 Oct 2017 16:17:18 +0200
+Subject: [PATCH] network: create default ifcfg also for missing default NM
+ connection (#1478141)
+
+In Fedora we create default ifcfg files by dumping default wired connections
+created by NM.  NM does not create such connections for InfiniBand devices and
+consequently installer crashes in text mode because of missing ifcfg file for
+the IB device.
+
+Create default ifcfg also when there is no NM default connection found for a
+(in this BZ case InfiniBand) device.
+
+This would be needed also when RHEL (server) policy is applied to the installer
+turning creating of default connections by NM off in general. With the patch,
+if default NM connection is not found, default ifcfg file is created in the
+same way as in rhel7-branch.
+---
+ pyanaconda/network.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/pyanaconda/network.py b/pyanaconda/network.py
+index a5b993be8..d0b147ec6 100644
+--- a/pyanaconda/network.py
++++ b/pyanaconda/network.py
+@@ -373,7 +373,13 @@ def dumpMissingDefaultIfcfgs():
+         try:
+             uuid = nm.nm_device_setting_value(devname, "connection", "uuid")
+         except nm.SettingsNotFoundError:
+-            log.debug("no ifcfg file for %s", devname)
++            from pyanaconda.kickstart import AnacondaKSHandler
++            handler = AnacondaKSHandler()
++            # pylint: disable=E1101
++            network_data = handler.NetworkData(onboot=False, ipv6="auto")
++            add_connection_for_ksdata(network_data, devname)
++            rv.append(devname)
++            log.debug("network: creating default ifcfg file for %s", devname)
+             continue
+         except nm.MultipleSettingsFoundError as e:
+             if not nm.nm_device_is_slave(devname):
+-- 
+2.13.6
+

0002-Mac-EFI-installs-need-grub2-tools-1503496.patch

@@ -0,0 +1,40 @@
+From fb82d621d25c6cc0705962085897364d2a23718b Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Thu, 19 Oct 2017 11:00:47 -0700
+Subject: [PATCH] Mac EFI installs need grub2-tools (#1503496)
+
+For the UEFI 64-on-32 stuff, pjones changed the MacEFIGRUB class
+to just define the `packages` attribute directly as a list of
+two packages; previously, MacEFIGRUB inherited the list from a
+parent class. As reported in #1503496, the two packages listed
+(grub2-tools-efi and mactel-boot) aren't enough for bootloader
+install to actually work.
+
+This changes things so MacEFIGRUB defines `_packages64`, like
+Aarch64EFIGRUB, which should effectively cause it to include
+those packages, plus the packages listed in the `GRUB2` class
+and the `_packages_common` from the `EFIGRUB` class. I'm not
+sure if that might be too many packages, but it's at least in
+line with how another class does things and simple. The other
+option would be just to extend the class's direct `packages`
+list.
+---
+ pyanaconda/bootloader.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
+index 93838fd0a..1e86c9769 100644
+--- a/pyanaconda/bootloader.py
++++ b/pyanaconda/bootloader.py
+@@ -1862,7 +1862,7 @@ class Aarch64EFIGRUB(EFIGRUB):
+     _efi_binary = "\\shimaa64.efi"
+ 
+ class MacEFIGRUB(EFIGRUB):
+-    packages = [ "grub2-tools-efi", "mactel-boot" ]
++    _packages64 = [ "grub2-tools-efi", "mactel-boot" ]
+     def mactel_config(self):
+         if os.path.exists(iutil.getSysroot() + "/usr/libexec/mactel-boot-setup"):
+             rc = iutil.execInSysroot("/usr/libexec/mactel-boot-setup", [])
+-- 
+2.13.6
+

1227.patch

@@ -0,0 +1,39 @@
+From fd2a64b5a6b5addc4e37ae8e1705d04f396f1044 Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Fri, 27 Oct 2017 19:25:35 +0200
+Subject: [PATCH] Add modular server repo to the base repositories (#1506894)
+
+The base repo is tested at the end of the installation and if the base
+repo is not enabled then the payload reset fails. This breaks closest
+source installation where this check is applied.
+
+The base repo is recognized by name and this name could have the
+following values:
+
+anaconda
+rawhide
+first part before "-" sign in the product name
+
+This doesn't work for Fedora-Modular because it is fedora but that can't
+be used for repo id or there will be repo name collision.
+
+Solved by adding fedora-modular-server to this list too.
+
+Resolves: rhbz#1506894
+---
+ pyanaconda/payload/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyanaconda/payload/__init__.py b/pyanaconda/payload/__init__.py
+index 91f679174d..aaf7b74630 100644
+--- a/pyanaconda/payload/__init__.py
++++ b/pyanaconda/payload/__init__.py
+@@ -980,7 +980,7 @@ def __init__(self, data):
+ class PackagePayload(Payload):
+     """A PackagePayload installs a set of packages onto the target system."""
+ 
+-    DEFAULT_REPOS = [productName.split('-')[0].lower(), "rawhide"]          # pylint: disable=no-member
++    DEFAULT_REPOS = [productName.split('-')[0].lower(), "fedora-modular-server", "rawhide"]  # pylint: disable=no-member
+ 
+     def __init__(self, data):
+         if self.__class__ is PackagePayload:

anaconda.spec

@@ -2,8 +2,8 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 27.20
-Release: 1%{?dist}
+Version: 27.20.4
+Release: 2.boltron.1%{?dist}
 License: GPLv2+ and MIT
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -15,37 +15,48 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+# fix Infiniband
+Patch1: 0001-network-create-default-ifcfg-also-for-missing-defaul.patch
+
+# fix Mac EFI
+Patch2: 0002-Mac-EFI-installs-need-grub2-tools-1503496.patch
+
+# Hack to support modular repos
+Patch1001: 1227.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
-%define gettextver 0.19.8
-%define pykickstartver 2.36-1
-%define dnfver 2.2.0
-%define partedver 1.8.1
-%define pypartedver 2.5-2
-%define nmver 1.0
-%define dbusver 1.2.3
-%define mehver 0.23-1
-%define firewalldver 0.3.5-1
-%define utillinuxver 2.15.1
-%define dracutver 034-7
-%define isomd5sum 1.0.10
-%define fcoeutilsver 1.0.12-3.20100323git
-%define iscsiver 6.2.0.873-26
-%define rpmver 4.10.0
-%define libarchivever 3.0.4
-%define langtablever 0.0.34
-%define libxklavierver 5.4
-%define libtimezonemapver 0.4.1-2
-%define helpver 22.1-1
-%define libblockdevver 2.1
 %define blivetguiver 2.1.5-2
+%define dbusver 1.2.3
+%define dnfver 2.2.0
+%define dracutver 034-7
+%define fcoeutilsver 1.0.12-3.20100323git
+%define firewalldver 0.3.5-1
+%define gettextver 0.19.8
+%define gtk3ver 3.22.17
+%define helpver 22.1-1
+%define iscsiver 6.2.0.873-26
+%define isomd5sum 1.0.10
+%define langtablever 0.0.34
+%define libarchivever 3.0.4
+%define libblockdevver 2.1
+%define libtimezonemapver 0.4.1-2
+%define libxklavierver 5.4
+%define mehver 0.23-1
+%define nmver 1.0
+%define partedver 1.8.1
+%define pykickstartver 2.40-1
+%define pypartedver 2.5-2
+%define rpmver 4.10.0
+%define simplelinever 0.6-1
+%define utillinuxver 2.15.1
 
 BuildRequires: audit-libs-devel
 BuildRequires: gettext >= %{gettextver}
-BuildRequires: gtk3-devel
+BuildRequires: gtk3-devel >= %{gtk3ver}
 BuildRequires: gtk-doc
-BuildRequires: gtk3-devel-docs
+BuildRequires: gtk3-devel-docs >= %{gtk3ver}
 BuildRequires: glib2-doc
 BuildRequires: gobject-introspection-devel
 BuildRequires: glade-devel
@@ -103,6 +114,7 @@ Requires: langtable-python3 >= %{langtablever}
 Requires: authconfig
 Requires: firewalld >= %{firewalldver}
 Requires: util-linux >= %{utillinuxver}
+Requires: python3-gobject-base
 Requires: python3-dbus
 Requires: python3-pwquality
 Requires: python3-systemd
@@ -185,7 +197,6 @@ Requires: NetworkManager-wifi
 %endif
 Requires: anaconda-user-help >= %{helpver}
 Requires: yelp
-Requires: python3-gobject-base
 Requires: blivet-gui-runtime >= %{blivetguiver}
 
 # Needed to compile the gsettings files
@@ -198,6 +209,7 @@ This package contains graphical user interface for the Anaconda installer.
 %package tui
 Summary: Textual user interface for the Anaconda installer
 Requires: anaconda-core = %{version}-%{release}
+Requires: python3-simpleline >= %{simplelinever}
 
 %description tui
 This package contains textual user interface for the Anaconda installer.
@@ -236,6 +248,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch1001 -p1
 
 %build
 %configure
@@ -306,7 +321,6 @@ update-desktop-database &> /dev/null || :
 
 %files gui
 %{python3_sitearch}/pyanaconda/ui/gui/*
-%{_datadir}/themes/Anaconda/*
 
 %files tui
 %{python3_sitearch}/pyanaconda/rescue.py
@@ -330,6 +344,93 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Fri Oct 27 2017 Stephen Gallagher <sgallagh@redhat.com> - 27.20.4-2.boltron.1
+- Add a hack to properly detect the modular base repo for netinst
+
+* Thu Oct 12 2017 Martin Kolman <mkolman@redhat.com> - 27.20.4-2
+- network: create default ifcfg also for missing default NM connection (#1478141) (rvykydal)
+- Mac EFI installs need grub2-tools (#1503496) (adamw)
+
+* Thu Oct 12 2017 Martin Kolman <mkolman@redhat.com> - 27.20.4-1
+- Fix a translation check error (mkolman)
+
+* Thu Oct 12 2017 Martin Kolman <mkolman@redhat.com> - 27.20.3-1
+- Mark the mount point assignment in TUI as experimental (vpodzime)
+- Reset storage on change in text mode (vpodzime)
+- Only allow the supported file systems in text mode (vpodzime)
+- Textual configuration of mount points (vpodzime)
+- Add support for the new 'mount' kickstart command (vpodzime)
+- Fix dnf exception repository not set (#1495211) (jkonecny)
+- Add logging of complete spokes in GUI. (rvykydal)
+- Do not execute storage when the spoke is left with no selected disk
+  (#1496327) (rvykydal)
+- Add checks for group names (#1497676) (vponcova)
+- Add new checks for user names (#1491006) (vponcova)
+
+* Fri Sep 29 2017 Martin Kolman <mkolman@redhat.com> - 27.20.2-1
+- Use name instead of index in TUI env selection (#1495204) (jkonecny)
+- Fix missing container in TUI source spoke (#1494801) (jkonecny)
+- Add MOCK_EXTRA_ARGS to Makefile (jkonecny)
+- tui source spoke: initialize nfs values when switching to nfs (rvykydal)
+- Deselect encryption when switching to blivet-gui partitioning (vtrefny)
+- Fix missing id to name environment transition (#1491119) (jkonecny)
+- Fix test for unset TUI software environment (#1491119) (jkonecny)
+- Rename processingDone to processing_done variable (jkonecny)
+- network: add support for kickstart --bindto=mac for virtual devices
+  (#1328576) (rvykydal)
+- network: support mac bound network settings as first class (#1328576)
+  (rvykydal)
+- network: add support for kickstart --bindto=mac for wired devices (#1328576)
+  (rvykydal)
+- Don't setup the hub twice (#1491333) (vponcova)
+- rpmostreepayload: Substitute ${basearch} in ostreesetup ref (walters)
+- Bump Simpleline version (jkonecny)
+- Perform repo checks only when there are checks available. (rvykydal)
+- Add support for repo --metalink (GUI) (#1464843) (rvykydal)
+- Add support for repo --metalink (kickstart, tui) (#1464843) (rvykydal)
+- Make EFIGRUB._efi_binary a property, not a method (awilliam)
+- Better storing logs from build and tests (jkonecny)
+- Provide a default install class. (vponcova)
+- Do not use hidden install classes. (vponcova)
+- Make geolocation with kickstart possible (#1358331) (mkolman)
+- Run python-meh as modal in TUI (jkonecny)
+- Use GLib event loop in the simpleline (jkonecny)
+- TUI progress reporting is handled by show_all (jkonecny)
+- Fix catch TUI not main thread exceptions (jkonecny)
+- Add efi_dir to the BaseInstallClass (#1412391) (vponcova)
+- Document Anaconda branching workflow (mkolman)
+- Use constants for version number bumps and additions (mkolman)
+- Fix closest mirror now needs network (jkonecny)
+- Fix restart payload thread in Network spoke GUI (#1478970) (jkonecny)
+- Network spoke freeze when testing availability (#1478970) (jkonecny)
+- Add support for adding version numbers to makebumpver (mkolman)
+- Add support for major version bump to makebumpver (mkolman)
+- Fix proxy settings badly used when testing repos (#1478970) (jkonecny)
+- Add inst.notmux option (dusty)
+
+* Tue Aug 29 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-1
+- Remove the metacity theme. (vponcova)
+- Add the option inst.decorated to allow title bar in GUI (vponcova)
+- Move python3-gobject Requires to core (jkonecny)
+- Return simpleline removed ipmi calls back (jkonecny)
+- Use new list container from Simpleline (jkonecny)
+- Remove old simpleline from anaconda (jkonecny)
+- Ask multiple times for wrong input (jkonecny)
+- Show TUI exception only first time (jkonecny)
+- Add simpleline logger to the Anaconda (jkonecny)
+- Modify TUI to use new Simpleline package (jkonecny)
+- Make 64-bit kernel on 32-bit firmware work for x86 efi machines (pjones)
+- Add missing gtk3 required version to spec file (jkonecny)
+- Sort spec required versions alphabetically (jkonecny)
+- Fix testing of the kickstart version (vponcova)
+- Move the installclass command to the %%anaconda section. (vponcova)
+- Fix SL install class to use right efi dir (riehecky)
+- Fix accelerator key for blivet-gui partitioning (#1482438) (vtrefny)
+- Add blivet-gui logs to python-meh file list (vtrefny)
+- Remove the title bar in anaconda by default (#1468801) (vponcova)
+- Add simple script to read journal with message code source and thread info.
+  (rvykydal)
+
 * Mon Aug 14 2017 Martin Kolman <mkolman@redhat.com> - 27.20-1
 - Add support for automatic generating of DBus specification. (vponcova)
 - Add support for generating XML (vponcova)

sources

@@ -1 +1 @@
-SHA512 (anaconda-27.20.tar.bz2) = e4f4b6b9686daa5db309a2b320c3acb308e11c43fd0fd0526b0125bf67f4b5e9eb0876110e441324fcea9918031ff3f1f6cd5808614e8902a160ebdca4a62682
+SHA512 (anaconda-27.20.4.tar.bz2) = 2782993e27122acd13ac32acf9a0ee61344af13fb732d9452f9cdbaa8376c35012ad22bc02396dae0d423ca434a9be98bfec4b03ab9442d3d9663d42b5bd2ca8