diff --git a/.gitignore b/.gitignore
index 61cab55..e14e91d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -305,3 +305,29 @@
/anaconda-34.25.0.22.tar.bz2
/anaconda-34.25.0.23.tar.bz2
/anaconda-34.25.0.24.tar.bz2
+/anaconda-34.25.0.25.tar.bz2
+/anaconda-34.25.0.26.tar.bz2
+/anaconda-34.25.0.27.tar.bz2
+/anaconda-34.25.1.1.tar.bz2
+/anaconda-34.25.1.2.tar.bz2
+/anaconda-34.25.1.3.tar.bz2
+/anaconda-34.25.1.4.tar.bz2
+/anaconda-34.25.1.5.tar.bz2
+/anaconda-34.25.1.6.tar.bz2
+/anaconda-34.25.1.7.tar.bz2
+/anaconda-34.25.1.8.tar.bz2
+/anaconda-34.25.1.9.tar.bz2
+/anaconda-34.25.1.10.tar.bz2
+/anaconda-34.25.1.11.tar.bz2
+/anaconda-34.25.1.12.tar.bz2
+/anaconda-34.25.1.13.tar.bz2
+/anaconda-34.25.1.14.tar.bz2
+/anaconda-34.25.2.1.tar.bz2
+/anaconda-34.25.2.2.tar.bz2
+/anaconda-34.25.2.3.tar.bz2
+/anaconda-34.25.2.4.tar.bz2
+/anaconda-34.25.2.5.tar.bz2
+/anaconda-34.25.2.6.tar.bz2
+/anaconda-34.25.2.7.tar.bz2
+/anaconda-34.25.2.8.tar.bz2
+/anaconda-34.25.2.9.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index f9ab1cb..132dfbc 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
-Version: 34.25.0.24
-Release: 1.1%{?dist}
+Version: 34.25.2.9
+Release: 1%{?dist}.1
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@@ -32,7 +32,7 @@ Patch20004: 20004-Change-fedora-welcome-to-centos-welcome.patch
%define fcoeutilsver 1.0.12-3.20100323git
%define gettextver 0.19.8
%define gtk3ver 3.22.17
-%define helpver 22.1-1
+%define helpver 9.0.0-1
%define isomd5sumver 1.0.10
%define langtablever 0.0.54
%define libarchivever 3.0.4
@@ -42,12 +42,12 @@ Patch20004: 20004-Change-fedora-welcome-to-centos-welcome.patch
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
-%define pykickstartver 3.32.2-1
+%define pykickstartver 3.32.9-1
%define pypartedver 2.5-2
-%define pythonblivetver 1:3.4.0-11.1
+%define pythonblivetver 1:3.6.0-5.hs.el9.1
%define rpmver 4.10.0
-%define simplelinever 1.1-1
-%define subscriptionmanagerver 1.26
+%define simplelinever 1.8.3-1
+%define subscriptionmanagerver 1.29.31
%define utillinuxver 2.15.1
# Because of Patch20004, we need to regenerate autofoo
@@ -200,6 +200,8 @@ Requires: tmux
Requires: gdb
# support for installation from image and live & live image installations
Requires: rsync
+# External tooling for managing NVMe-FC devices in the installation environment
+Recommends: nvme-cli
%description install-env-deps
The anaconda-install-env-deps metapackage lists all installation environment dependencies.
@@ -238,6 +240,8 @@ Requires: device-mapper-multipath
Requires: zram-generator
# Submitting bugs to bugzilla
Requires: libreport-rhel-anaconda-bugzilla
+# External tooling for managing NVMe-FC devices in the installation environment
+Requires: nvme-cli
%description install-img-deps
The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
@@ -426,6 +430,229 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
+* Thu Mar 02 2023 Michel Alexandre Salim <salimma@centosproject.org> - 34.25.2.9-1.1
+- Re-add changes for CentOS Hyperscale spin from 34.25.0.24-1.1
+
+* Wed Feb 15 2023 Vendula Poncova <vponcova@redhat.com> - 34.25.2.9-1
+- Fix network configuration from kickstart in intramfs (rvykydal)
+ Resolves: rhbz#2153361
+
+* Thu Feb 09 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.2.8-1
+- Show only usable devices in custom partitioning (jstodola)
+ Resolves: rhbz#2052938
+
+* Thu Feb 02 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.2.7-1
+- Show an error message when subscription token transfer fails (mkolman)
+ Resolves: rhbz#2057472
+- Bump blivet version for NVMe-oF support (vslavik)
+ Resolves: rhbz#2164343
+- Make text in custom_storage_helper more accurate (ozobal)
+ Resolves: rhbz#2133046
+- Fix infobar colors in GTK GUI (ozobal)
+ Resolves: rhbz#2074827
+
+* Wed Jan 11 2023 Vladimír Slávik <vslavik@redhat.com> - 34.25.2.6-1
+- Add a NVMe-FC tab to the Advanced Storage screen (vslavik)
+ Resolves: rhbz#2107346
+- Update the .glade file for the Advanced Storage screen (vponcova)
+ Related: rhbz#2107346
+- Filter out NVMe over Fibre Channel from local disks (vslavik)
+ Resolves: rhbz#2107346
+- Install nvme-cli on boot.iso (vslavik)
+ Resolves: rhbz#2107346
+
+* Mon Jan 09 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.2.5-1
+- payload: fix repo --includepkgs option (rvykydal)
+ Resolves: rhbz#2158210
+- bootloader/zipl.py: update for zipl >= 2.25.0 (dan)
+ Resolves: rhbz#2157916
+
+* Tue Jan 03 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.2.4-1
+- Delegate auto-attach handling to RHSM (mkolman)
+ Resolves: rhbz#2083319
+- Use RHEL9_SshKeyData to fix sshkey quoting problem (bcl)
+ Resolves: rhbz#2149362
+- Test the InstallerStorage.copy method (vponcova)
+ Related: rhbz#2093793
+- Show multiple bootloader devices on the Manual Partitioning screen (vponcova)
+ Resolves: rhbz#2093793
+- Implement the Root.copy method (vponcova)
+ Related: rhbz#2093793
+- Redefine the Blivet.roots attribute (vponcova)
+ Related: rhbz#2093793
+- Redefine the Blivet.copy method (vponcova)
+ Related: rhbz#2093793
+- Use correct hint for VNC password boot option (jstodola)
+ Resolves: rhbz#2124818
+
+* Mon Nov 28 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.2.3-1
+- Disable the concurrency check in the error dialog in TUI (vponcova)
+ Resolves: rhbz#2070920
+- Support bond device activated in initramfs from kickstart (rvykydal)
+ Resolves: rhbz#2133053
+
+* Thu Nov 10 2022 Martin Kolman <mkolman@redhat.com> - 34.25.2.2-1
+- Initialize empty disks on the Manual Partitioning screen (vponcova)
+ Resolves: rhbz#2127100
+- infra: Set test vars from templates (vslavik)
+- infra: Port check for matching templates from master (vslavik)
+- infra: Port templating mechanism from master (vslavik)
+- dracut: read filename dhcp option from dhcpopts file (rvykydal)
+ Related: rhbz#1991843
+
+* Thu Oct 27 2022 Martin Kolman <mkolman@redhat.com> - 34.25.2.1-1
+- network: fix doc string of add_connection_sync (rvykydal)
+ Related: rhbz#2125256
+- network: use separate main conext for NM client in threads (rvykydal)
+ Resolves: rhbz#2125256
+
+* Thu Sep 08 2022 Vendula Poncova <vponcova@redhat.com> - 34.25.1.14-1
+- Do not crash on network --device link with wireless device (rvykydal)
+ Resolves: rhbz#2063127
+
+* Tue Sep 06 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.13-1
+- gui: fix summary hub layout for Japanese translations (rvykydal)
+ Resolves: rhbz#2120293
+
+* Wed Aug 17 2022 Martin Kolman <mkolman@redhat.com> - 34.25.1.12-1
+- Improve Register button click feedback (mkolman)
+ Resolves: rhbz#2074636
+
+* Thu Aug 04 2022 Vladimir Slavik <vslavik@redhat.com> - 34.25.1.11-1
+- Disable the Unregister button during unregistration (mkolman)
+ Resolves: rhbz#2068192
+- Install rdma-core if infiniband network device is found (rvykydal)
+ Resolves: rhbz#2050331
+
+* Tue Jul 19 2022 Jiri Konecny <jkonecny@redhat.com> - 34.25.1.10-1
+- Communicate media verification result clearly (vslavik)
+ Related: rhbz#2057469
+- Media verification dialog button reflects state (vslavik)
+ Resolves: rhbz#2057469
+- Add tooltip to the Insights checkbox (jkonecny)
+ Resolves: rhbz#2071665
+- Increase the minimal suggested size for /boot (vslavik)
+ Resolves: rhbz#2042431
+
+* Thu Jul 14 2022 Martin Kolman <mkolman@redhat.com> - 34.25.1.9-1
+- Allow to omit WWPN and LUN for NPIV-enabled zFCP devices (jstodola)
+ Resolves: rhbz#1937032
+- Reduce the width of the zFCP dialog (jstodola)
+ Related: rhbz#1937032
+- Fix product config product_name for Rocky Linux (tucklesepk)
+ Resolves: rhbz#2096046
+- Add Circle Linux profile to Anaconda(rhel-9) (bella)
+ Resolves: rhbz#2095351
+
+* Tue Jun 28 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.8-1
+- bootloader: do not consider non-ibft iscsi disk as usable for bootloader
+ (rvykydal)
+ Resolves: rhbz#2003519
+- Fix kickstart command order in new version (vslavik)
+ Resolves: rhbz#2100463
+- TUI software spoke is ready with failing repos, too (vslavik)
+ Resolves: rhbz#2020299
+
+* Thu Jun 16 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.7-1
+- tests: update the order of commands (rootpw) in generated kickstart
+ (rvykydal)
+ Related: rhbz#2033849
+- dnf: apply the /etc/dnf/dnf.conf configuration file in the installer
+ (rvykydal)
+ Resolves: rhbz#2053710
+- Add support for rootpw --allow-ssh (rvykydal)
+ Resolves: rhbz#2033849
+
+* Fri Jun 10 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.6-1
+- Report registration errors from kickstart (mkolman)
+ Resolves: rhbz#2000652
+- GUI: Show the dialog for a missing passphrase in an enlight box (vponcova)
+ Related: rhbz#2087218
+- GUI: Ask for a missing passphrase during automated installations (vponcova)
+ Resolves: rhbz#2087218
+- Create functions for a missing passphrase in pyanaconda.ui.lib (vponcova)
+ Related: rhbz#2087218
+- Add missing period when concatenating password error strings (jkonecny)
+ Resolves: rhbz#2075417
+- Enable bootloader hiding on RHEL (rharwood)
+ Resolves: rhbz#2059414
+
+* Wed Jun 01 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.5-1
+- Run FixZIPLBootloader task after FIPS setup (rvykydal)
+ Resolves: rhbz#2022841
+
+* Thu May 26 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.4-1
+- Cleanup unneeded NFS repo with rd.live.ram parameter (mmatsuya)
+ Resolves: rhbz#2082132
+
+* Tue May 24 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.3-1
+- Run restorecon in chroot when handling home dirs (vslavik)
+ Resolves: rhbz#2072426
+- Move restorecon calls in Tasks to a helper function (vslavik)
+ Related: rhbz#2072426
+- Add Virtuozzo Linux profile to Anaconda (dsilakov)
+ Resolves: rhbz#2067195
+
+* Wed Apr 20 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.2-1
+- ovirt: move /var/tmp to its own partition (sbonazzo)
+ Resolves: rhbz#2058538
+
+* Thu Mar 17 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.1.1-1
+- Make failure in generating of dracut arguments for iSCSI device non-fatal.
+ (rvykydal)
+ Resolves: rhbz#2065171
+- Do not generate dracut arguments multiple times for some storage devices
+ (rvykydal)
+ Related: rhbz#2065171
+- Skip /etc/machine-info during live installs (awilliam)
+ Resolves: rhbz#2065170
+
+* Thu Feb 24 2022 Vendula Poncova <vponcova@redhat.com> - 34.25.0.27-1
+- Use cache when fetching organization data from the GUI (mkolman)
+ Resolves: rhbz#2044258
+- Bump subscription-manager version (mkolman)
+ Related: rhbz#2048449
+- Improve UX in Simple Content Access mode (mkolman)
+ Resolves: rhbz#2048449
+- Add IsSimpleContentAccessEnabled property (mkolman)
+ Related: rhbz#2048449
+- Add support for SCA mode detection from registration data (mkolman)
+ Related: rhbz#2048449
+
+* Thu Feb 03 2022 Vladimir Slavik <vslavik@redhat.com> - 34.25.0.26-1
+- Write all PVs to LVM devices file (vslavik)
+ Resolves: rhbz#2040302
+- Fix the status of the root configuration screen (vponcova)
+ Related: rhbz#2026916
+- Fix the condition for entering the root configuration (vponcova)
+ Resolves: rhbz#2026916
+- Move tests for pyanaconda.ui.lib.users to a new file (vponcova)
+ Related: rhbz#2026916
+
+* Tue Jan 18 2022 Vladimir Slavik <vslavik@redhat.com> - 34.25.0.25-1
+- Hide the help button on the progress spoke (vponcova)
+ Related: rhbz#1995945
+- Enable the built-in help content (vponcova)
+ Resolves: rhbz#1995945
+- Remove the provides_web_browser property (vponcova)
+ Related: rhbz#1995945
+- Cache the parsed content of the help mapping files (vponcova)
+ Related: rhbz#1995945
+- Remove the default_help_pages configuration option (vponcova)
+ Related: rhbz#1995945
+- Remove the helpFile attribute (vponcova)
+ Related: rhbz#1995945
+- Implement the unified help support (vponcova)
+ Related: rhbz#1995945
+- Define a unique id in the main spokes and hubs (vponcova)
+ Related: rhbz#1995945
+- Add the Screen class (vponcova)
+ Related: rhbz#1995945
+- Enable Closest mirror on CentOS Stream 9 (jkonecny)
+ Related: rhbz#1955331
+- Do not modify boot order on UEFI if asked (vslavik)
+ Resolves: rhbz#2025953
+
* Mon Jan 17 2022 Neal Gompa <ngompa@centosproject.org> - 34.25.0.24-1.1
- Add changes for CentOS Hyperscale spin
+ Re-enable Btrfs support
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 1ffcafc..a547dcb 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -5,3 +5,8 @@ inspections:
# The icon org.fedoraproject.AnacondaInstaller is part of
# fedora-logos package
desktop: off
+
+changedfiles:
+ # Ignore updated translations
+ ignore:
+ - /usr/share/locale/*/LC_MESSAGES/anaconda.mo
diff --git a/sources b/sources
index 3662d83..22062b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (anaconda-34.25.0.24.tar.bz2) = ea8ac046f0d50d2fb3111a081f2cf1363c0a7f90d2d07996abcdb49694c41aa78bcce62938012ae686ce6967a9f3a5b20dba2c6ebca6c9bac4d87648772222ea
+SHA512 (anaconda-34.25.2.9.tar.bz2) = cd4f114661ee3e80690a3a6e18564b69e6e2c0749e24780f57e9d0517b8eaa227f75dacd2788846c3947e670672b0f2f889de2291789e8de137c93e2f486ed43
diff --git a/tests/dirinstall/dirinstall.sh b/tests/dirinstall/dirinstall.sh
index 95a8f15..a75951d 100755
--- a/tests/dirinstall/dirinstall.sh
+++ b/tests/dirinstall/dirinstall.sh
@@ -9,14 +9,36 @@ WORK_DIR=$(mktemp -d /var/tmp/dirinstall.XXXXXX)
# Create kickstart
KICKSTART_PATH=${WORK_DIR}/ks.cfg
-source ./repositories
+. ./repositories
TEST_KICKSTART=./ks.dirinstall.cfg
+echo "==== List of repositories ===="
+dnf repoinfo
+echo "== End list of repositories =="
+
+if grep -q 'NAME="CentOS Stream"' /etc/os-release ; then
+ BASE_REPO="$STREAM_BASE_REPO"
+ APP_REPO="$STREAM_APP_REPO"
+else
+ BASE_REPO="$RHEL_BASE_REPO"
+ APP_REPO="$RHEL_APP_REPO"
+fi
+
+get_base_url () {
+ REPO="$1"
+
+ # This will show repository content and get url from this:
+ # Repo-baseurl : http://ftp.sh.cvut.cz/centos-stream/9-stream/BaseOS/x86_64/os/ (51 more)
+ dnf repoinfo "$REPO" | \
+ grep ^Repo-baseurl | \
+ cut -d: -f2- | \
+ sed 's/^ *//' | \
+ cut -d' ' -f1
+}
+
# Dump URLs of installation repositories found in local repositories whose names are configured in 'repositories' file
-echo "url --url=$(dnf repoinfo $BASE_REPO | grep ^Repo-baseurl | cut -d: -f2- | sed 's/^ *//')" > ${KICKSTART_PATH}
-for repo in $REPOS; do
- echo "repo --name=$repo --baseurl=$(dnf repoinfo $repo | grep ^Repo-baseurl | cut -d: -f2- | sed 's/^ *//')" >> ${KICKSTART_PATH}
-done
+echo "url --url=$(get_base_url $BASE_REPO)" > ${KICKSTART_PATH}
+echo "repo --name=$APP_REPO --baseurl=$(get_base_url $APP_REPO)" >> ${KICKSTART_PATH}
cat ${TEST_KICKSTART} >> ${KICKSTART_PATH}
diff --git a/tests/dirinstall/repositories b/tests/dirinstall/repositories
index 5cc527f..b49ac23 100644
--- a/tests/dirinstall/repositories
+++ b/tests/dirinstall/repositories
@@ -1,4 +1,8 @@
# Names of local repositories whose urls will be used for installation
# Repositories for rhel in gating testing environment (vm image):
-BASE_REPO="rhel"
-REPOS="rhel-AppStream"
+RHEL_BASE_REPO="rhel"
+RHEL_APP_REPO="rhel-AppStream"
+
+# Repositories for CentOS Stream in gating testing environment:
+STREAM_BASE_REPO="baseos"
+STREAM_APP_REPO="appstream"