diff --git a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch
index e693ccc..e0ec7a2 100644
--- a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch
+++ b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch
@@ -1,7 +1,7 @@
From 4ebcf9d422bef11bd5b50f421a4b30ed826d1cbb Mon Sep 17 00:00:00 2001
From: Vladimir Slavik <vslavik@redhat.com>
Date: Tue, 15 Sep 2020 09:57:58 +0200
-Subject: [PATCH 20001/20006] Import RPM certificates at end of installation
+Subject: [PATCH 20001/20007] Import RPM certificates at end of installation
This adds code and a new config key for importing RPM certificates, and
enables it for all of Fedora.
diff --git a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch
index a25b5f4..390f93e 100644
--- a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch
+++ b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch
@@ -1,7 +1,7 @@
From 5d5d1a7099537a0da7c5a54520d7474b4696d940 Mon Sep 17 00:00:00 2001
From: Vendula Poncova <vponcova@redhat.com>
Date: Fri, 27 Nov 2020 13:30:53 +0100
-Subject: [PATCH 20002/20006] Define the updates repositories in the Anaconda
+Subject: [PATCH 20002/20007] Define the updates repositories in the Anaconda
configuration files (#1642513)
Replace the enable_updates configuration option with the updates_repositories
diff --git a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch
index 2d08a81..a41341a 100644
--- a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch
+++ b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch
@@ -1,7 +1,7 @@
From 1a19890f66c6e746f3d6a9cd5c981946552e07a7 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Fri, 14 May 2021 15:03:05 -0400
-Subject: [PATCH 20003/20006] Revert "Remove kickstart btrfs support"
+Subject: [PATCH 20003/20007] Revert "Remove kickstart btrfs support"
Restore Btrfs support for Kickstart so system installations can
use Btrfs and images can be built using Lorax with Btrfs as the
diff --git a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch
index b71ff6a..8e89fef 100644
--- a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch
+++ b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch
@@ -1,7 +1,7 @@
From 225e4acb9ec64c8fdc944c485aff74bc0441f171 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Sat, 26 Jun 2021 08:21:49 -0400
-Subject: [PATCH 20004/20006] Add product configuration for CentOS Stream
+Subject: [PATCH 20004/20007] Add product configuration for CentOS Stream
Hyperscale variant
This is a minimal product configuration layered on top of the
diff --git a/SOURCES/20005-Storage-add-btrfs_compression-option.patch b/SOURCES/20005-Storage-add-btrfs_compression-option.patch
index 62baf93..aec3582 100644
--- a/SOURCES/20005-Storage-add-btrfs_compression-option.patch
+++ b/SOURCES/20005-Storage-add-btrfs_compression-option.patch
@@ -1,7 +1,7 @@
From ab2ee2d89ed127fcd59326bec85a9404dbbaa425 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <michel@michel-slm.name>
Date: Tue, 16 Feb 2021 18:39:29 -0800
-Subject: [PATCH 20005/20006] [Storage] add btrfs_compression option
+Subject: [PATCH 20005/20007] [Storage] add btrfs_compression option
This is a new option to allow specifying the compression algorithm and
level for Btrfs filesystems. If set, it will be passed to Blivet and
diff --git a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch
index 4371c6b..c508e8e 100644
--- a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch
+++ b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch
@@ -1,7 +1,7 @@
From 32dede4a858792a6ff5ce57e4552ae42f35b17d3 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@centosproject.org>
Date: Sun, 27 Jun 2021 17:46:23 -0400
-Subject: [PATCH 20006/20006] Change rhel-welcome to centos-welcome
+Subject: [PATCH 20006/20007] Change rhel-welcome to centos-welcome
This is being used for CentOS Stream rather than
Red Hat Enterprise Linux, so adjust accordingly.
diff --git a/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch b/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch
new file mode 100644
index 0000000..4d19b80
--- /dev/null
+++ b/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch
@@ -0,0 +1,39 @@
+From e29db11f7cae3d42fe08ef0787f7f419acaff88c Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@centosproject.org>
+Date: Sun, 27 Jun 2021 21:01:07 -0400
+Subject: [PATCH 20007/20007] Add support for detecting the Hyperscale variant
+ in liveinst
+
+Anaconda does not rely on os-release(5) data directly to determine
+which product data to load, but instead needs either a /.buildstamp
+file or logic to populate environment variables to have Anaconda
+select the right configuration.
+
+This change adds logic to set the ANACONDA_PRODUCTVARIANT variable
+when the Hyperscale variant is detected on the system.
+---
+ data/liveinst/liveinst | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
+index 4e3a670f3..b7106bbc1 100755
+--- a/data/liveinst/liveinst
++++ b/data/liveinst/liveinst
+@@ -50,6 +50,14 @@ if [ -f /etc/system-release ]; then
+ export ANACONDA_PRODUCTVERSION=$( cat /etc/system-release | sed -r -e 's/^.* ([0-9\.]+).*$/\1/' )
+ fi
+
++# set PRODUCTVARIANT if this is a CentOS Stream Hyperscale live image
++if [ -f /etc/os-release ]; then
++ variantid=$( grep VARIANT_ID /etc/os-release | tail -1 | cut -d= -f2)
++ if [ "$variantid" = "hyperscale" ]; then
++ export ANACONDA_PRODUCTVARIANT="Hyperscale"
++ fi
++fi
++
+ # set PRODUCTVARIANT if this is a Fedora Workstation live image
+ # FIXME really, livemedia-creator should include .buildstamp in live
+ # images, if it did, we could remove this:
+--
+2.31.1
+
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 3c4aed0..ec3d00f 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 33.16.5.2
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@@ -23,6 +23,7 @@ Patch20003: 20003-Revert-Remove-kickstart-btrfs-support.patch
Patch20004: 20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch
Patch20005: 20005-Storage-add-btrfs_compression-option.patch
Patch20006: 20006-Change-rhel-welcome-to-centos-welcome.patch
+Patch20007: 20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -392,6 +393,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
+* Sun Jun 27 2021 Neal Gompa <ngompa@centosproject.org> - 33.16.5.2-4
+- Fix liveinst to be able to detect Hyperscale variant
+
* Sun Jun 27 2021 Neal Gompa <ngompa@centosproject.org> - 33.16.5.2-3
- Debrand the liveinst welcome widget