diff --git a/.anaconda.metadata b/.anaconda.metadata
index 5f94c10..6387d96 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-7705327b7a750eeaeeda887a2937f3dfcb202f99 SOURCES/anaconda-29.19.1.13.tar.bz2
+632462bddbdc19d45ca62725bff1a37cccb4babf SOURCES/anaconda-29.19.2.17.tar.bz2
diff --git a/.gitignore b/.gitignore
index 72e29bd..8836092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-29.19.1.13.tar.bz2
+SOURCES/anaconda-29.19.2.17.tar.bz2
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch b/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
deleted file mode 100644
index fad6d73..0000000
--- a/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From baa49690977c02b258bcd4e7c274ecc46919856a Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Wed, 10 Jul 2019 09:48:12 -0500
-Subject: [PATCH] branding: syspurpose doesn't make sense for CentOS
-
----
- pyanaconda/ui/gui/spokes/system_purpose.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pyanaconda/ui/gui/spokes/system_purpose.py b/pyanaconda/ui/gui/spokes/system_purpose.py
-index 98664de..a73d6f9 100644
---- a/pyanaconda/ui/gui/spokes/system_purpose.py
-+++ b/pyanaconda/ui/gui/spokes/system_purpose.py
-@@ -62,6 +62,10 @@ class SystemPurposeSpoke(NormalSpoke):
- # record if the spoke has been visited by the user at least once
- self._spoke_visited = False
-
-+ @property
-+ def showable(self):
-+ return False
-+
- def initialize(self):
- NormalSpoke.initialize(self)
- self.initialize_start()
---
-1.8.3.1
-
diff --git a/SOURCES/0002-add-centos-background-color.patch b/SOURCES/0002-add-centos-background-color.patch
deleted file mode 100644
index f0d45c4..0000000
--- a/SOURCES/0002-add-centos-background-color.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- anaconda-29.19.0.40-orig/data/anaconda-gtk.css 2019-07-12 01:08:43.579816964 -0300
-+++ anaconda-29.19.0.40/data/anaconda-gtk.css 2019-07-12 01:09:52.994191971 -0300
-@@ -81,10 +81,11 @@
-
- @define-color redhat #2d2d2d;
- @define-color fedora #2f4265;
-+@define-color centos #000a38;
-
- /* theme colors/images */
-
--@define-color theme_bg_color @redhat;
-+@define-color theme_bg_color @centos;
-
- /* logo and sidebar classes */
-
diff --git a/SOURCES/centos-l10n.patch b/SOURCES/centos-l10n.patch
deleted file mode 100644
index 4b4f968..0000000
--- a/SOURCES/centos-l10n.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -uNrp anaconda-29.19.0.43.orig/po/cs.po anaconda-29.19.0.43/po/cs.po
---- anaconda-29.19.0.43.orig/po/cs.po 2019-08-27 02:39:42.000000000 -0500
-+++ anaconda-29.19.0.43/po/cs.po 2019-10-07 10:12:11.359293162 -0500
-@@ -6508,8 +6508,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "ÚČEL SYSTÉMU"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7095,24 +7095,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Vítejte v Red Hat Enterprise Linuxu"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Vítejte v CentOS Linuxu"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Nastavení Liveinst"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Zkuste RHEL"
-+msgid "Try CentOS"
-+msgstr "Zkuste CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Máte Red Hat Enterprise Linux spuštěný z LIVE média.\n"
--"Můžete instalovat Red Hat Enterprise Linux hned, nebo vybrat \"Instalovat na pevný disk\" v Přehledu Aktivit kdykoli později."
-+"Máte CentOS Linux spuštěný z LIVE média.\n"
-+"Můžete instalovat CentOS Linux hned, nebo vybrat \"Instalovat na pevný disk\" v Přehledu Aktivit kdykoli později."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
- msgid ""
-diff -uNrp anaconda-29.19.0.43.orig/po/nl.po anaconda-29.19.0.43/po/nl.po
---- anaconda-29.19.0.43.orig/po/nl.po 2019-08-27 02:40:55.000000000 -0500
-+++ anaconda-29.19.0.43/po/nl.po 2019-10-07 10:13:01.923292945 -0500
-@@ -6533,8 +6533,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "SYSTEEMDOEL"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7132,24 +7132,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Welkom bij Red Hat Enterprise Linux"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Welkom bij CentOS Linux"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Liveinst instelling"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Probeer RHEL"
-+msgid "Try CentOS"
-+msgstr "Probeer CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Je draait Red Hat Enterprise Linux op dit moment vanaf live-media.\n"
--"Je kunt Red Hat Enterprise Linux nu installeren, of je kiest \"Naar harde schijf installeren\" in het 'Activiteiten'-overzicht op een later moment."
-+"Je draait CentOS Linux op dit moment vanaf live-media.\n"
-+"Je kunt CentOS Linux nu installeren, of je kiest \"Naar harde schijf installeren\" in het 'Activiteiten'-overzicht op een later moment."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
- msgid ""
-diff -uNrp anaconda-29.19.0.43.orig/po/sk.po anaconda-29.19.0.43/po/sk.po
---- anaconda-29.19.0.43.orig/po/sk.po 2019-08-27 02:41:33.000000000 -0500
-+++ anaconda-29.19.0.43/po/sk.po 2019-10-07 10:13:32.832292813 -0500
-@@ -6508,8 +6508,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "ÚČEL SYSTÉMU"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7098,23 +7098,23 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Vitajte v Red Hat Enterprise Linuxe"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Vitajte v CentOS Linuxe"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Nastavenie Liveinst"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Vyskúšajte RHEL"
-+msgid "Try CentOS"
-+msgstr "Vyskúšajte CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Momentálne máte spustený systém Red Hat Enterprise Linux z live média.\n"
-+"Momentálne máte spustený systém CentOS Linux z live média.\n"
- "Môžete ho nainštalovať ihneď alebo kedykoľvek neskôr spustením odkazu „Inštalovať na pevný disk“ v prehľade Aktivít."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
-diff -uNrp anaconda-29.19.1.13.orig/po/be.po anaconda-29.19.1.13/po/be.po
---- anaconda-29.19.1.13.orig/po/be.po 2019-09-27 03:13:43.000000000 -0500
-+++ anaconda-29.19.1.13/po/be.po 2019-11-19 09:49:56.088956465 -0600
-@@ -6526,8 +6526,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "ПРЫЗНАЧЭННЕ СІСТЭМЫ"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Умова ўзроўню паслугаў Red Hat"
-+msgid "Support"
-+msgstr "Умова ўзроўню паслугаў"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7110,24 +7110,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Вітаем у сістэме Red Hat Enterprise Linux"
-+msgid "Welcome to centOS Linux"
-+msgstr "Вітаем у сістэме centOS Linux"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Наладка інсталяцыі Live"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Паспрабуй RHEL"
-+msgid "Try CentOS"
-+msgstr "Паспрабуй CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running centOS Linux from live media.\n"
-+"You can install centOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Цяпер вы запусцілі Red Hat Enterprise Linux з live носьбіта. Можна зараз "
--"інсталяваць Red Hat Enterprise Linux альбо у любы пазнейшы час пазначце "
-+"Цяпер вы запусцілі centOS Linux з live носьбіта. Можна зараз "
-+"інсталяваць centOS Linux альбо у любы пазнейшы час пазначце "
- "\"Інсталяваць на цвёрды дыск\" у аглядзе дзеянняў."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 69a55d2..9602162 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -6,15 +6,12 @@
Summary: Graphical system installer
Name: anaconda
-Version: 29.19.1.13
+Version: 29.19.2.17
Release: 1%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
-Patch100: centos-l10n.patch
-Patch101: 0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
-Patch102: 0002-add-centos-background-color.patch
# To generate Source0 do:
# git clone https://github.com/rhinstaller/anaconda
# git checkout -b archive-branch anaconda-%%{version}-%%{release}
@@ -40,7 +37,7 @@ Source0: %{name}-%{version}.tar.bz2
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
-%define pykickstartver 3.16.6-1
+%define pykickstartver 3.16.8-1
%define pypartedver 2.5-2
%define rpmver 4.10.0
%define simplelinever 1.1-1
@@ -109,6 +106,7 @@ Requires: python3-systemd
Requires: python3-pydbus
Requires: python3-productmd
Requires: python3-syspurpose
+Requires: subscription-manager >= 1.26
# pwquality only "recommends" the dictionaries it needs to do anything useful,
# which is apparently great for containers but unhelpful for the rest of us
@@ -268,10 +266,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
# If no langs found, keep going
%find_lang %{name} || :
-%post widgets -p /sbin/ldconfig
-%postun widgets -p /sbin/ldconfig
-
-
%ifarch %livearches
%post
update-desktop-database &> /dev/null || :
@@ -347,8 +341,146 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
-* Tue Nov 05 2019 CentOS Sources <bugs@centos.org> - 29.19.1.13-1.el8.centos
-- Apply debranding changes
+* Fri Mar 13 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.17-1
+- Make sure rhsm.service is running at Anaconda startup (mkolman)
+ Resolves: rhbz#1805266
+
+* Fri Feb 21 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.16-1
+- Fix crash on single disk selection in GUI (rvykydal)
+ Resolves: rhbz#1805613
+
+* Thu Feb 20 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.15-1
+- Fix installation source switching to/from CDN (mkolman)
+ Resolves: rhbz#1788487
+ Resolves: rhbz#1790383
+ Resolves: rhbz#1791376
+
+* Thu Feb 20 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.14-1
+- Do not allow selecting ignored disk in GUI even if it is the only one
+ (rvykydal)
+ Resolves: rhbz#1786561
+
+* Tue Feb 11 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.13-1
+- Disable package download to / /tmp (jkonecny)
+ Resolves: rhbz#1781517
+
+* Thu Feb 06 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.12-1
+- network: fix GUI crash on invalid devices in the list (rvykydal)
+ Resolves: rhbz#1697256
+
+* Mon Feb 03 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.11-1
+- Fix DBus error detection (mkolman)
+ Related: rhbz#1794767
+- Make sure RHSM HTTP proxy port from kickstart is an integer (mkolman)
+ Resolves: rhbz#1794025
+
+* Thu Jan 23 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.10-1
+- Log exceptions raised in subscription data fetching method (mkolman)
+ Related: rhbz#1788036
+- Fix subscription status not being displayed in some cases (mkolman)
+ Resolves: rhbz#1788036
+- Make sure syspurpose is set before registration in GUI (mkolman)
+ Resolves: rhbz#1788207
+ Related: rhbz#1788036
+- Update pep8speaks checker configuration for the branch (rvykydal)
+ Related: rhbz#1788036
+
+* Thu Jan 16 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.9-1
+- Fix RHSM HTTP proxy configuration clearing (mkolman)
+ Resolves: rhbz#1789814
+- Add scrolling for the registration tab (mkolman)
+ Resolves: rhbz#1788422
+
+* Thu Jan 09 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.8-1
+- Fix output kickstart generation for subscription commands (mkolman)
+ Resolves: rhbz#1788579
+ Resolves: rhbz#1788513
+- Fix GTK access from subscription thread (mkolman)
+ Resolves: rhbz#1787615
+
+* Mon Jan 06 2020 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.7-1
+- Fix branding in the Connect to Red Hat spoke (mkolman)
+ Resolves: rhbz#1787342
+
+* Fri Dec 13 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.6-1
+- Fix RHSM HTTP proxy setup (mkolman)
+ Related: rhbz#1748281
+- Fix text color on info bars (mkolman)
+ Resolves: rhbz#1782174
+
+* Tue Dec 10 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.5-1
+- Adjust unit tests (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Extend list of false positives in the style guide (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Subscription support - changes in GUI (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Extend the anaconda-gtk.css (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Subscription support - changes in installation payload (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Subscription support - changes in DBus modules (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Subscription support - changes outside of DBus modules (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Add temporary subscription scheduling module (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Add basic CDN support to Payload DBus module (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Add support for custom interface for DBus Tasks (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Backport locale support for modules (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+- Add subscription manager as an Anaconda dependency (mkolman)
+ Resolves: rhbz#1748281
+ Resolves: rhbz#1746391
+
+* Tue Nov 12 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.4-1
+- Add UI support for the ZIPL Secure boot (vponcova)
+ Related: rhbz#1659400
+- Add DBus support for the ZIPL Secure Boot (vponcova)
+ Resolves: rhbz#1659400
+- Don't mention new-kernel-pkg anymore in /etc/sysconfig/kernel (javierm)
+ Resolves: rhbz#1747382
+- Don't print warnings for new-kernel-pkg not being present (javierm)
+ Related: rhbz#1747382
+
+* Tue Oct 22 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.3-1
+- Only attempt to open the ibm,max-boot-devices sysfs entry if it exists
+ (javierm)
+ Related: rhbz#1748756
+
+* Mon Oct 21 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.2-1
+- Don't add more devices in boot-device NVRAM than the maximum allowed
+ (javierm)
+ Resolves: rhbz#1748756
+- Fix local repo files aren't enabled (jkonecny)
+ Resolves: rhbz#1641620
+- Remove ldconfig spec macros (jkonecny)
+ Resolves: rhbz#1700685
+- Don't try to format FBA DASD devices (mmatsuya)
+ Resolves: rhbz#1715303
+
+* Mon Oct 14 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.1-1
+- Skip buildins when processing kernel boot args (jkonecny)
+ Resolves: rhbz#1637472
+- network: fix handling of ksdevice=bootif in initramfs (rvykydal)
+ Related: rhbz#1649359
+- Make sure we work with fresh data when trying to do netroot (vpodzime)
+ Resolves: rhbz#1649359
+- Make our manual triggering on network in dracut work (vpodzime)
+ Resolves: rhbz#1649359
* Fri Sep 27 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.13-1
- Change the bases of the install classes for RHVH (vponcova)