0027-lvm-ensure-qubes-prefix-in-lvgroup-name.patch

From 0e0440b4fef20eb919ac3a0073e553b9c8ddac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Tue, 7 Jan 2020 19:20:22 +0100
Subject: [PATCH] lvm: ensure 'qubes' prefix in lvgroup name

---
 pyanaconda/storage/osinstall.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/storage/osinstall.py b/pyanaconda/storage/osinstall.py
index f9aa02db9..642f1ace4 100644
--- a/pyanaconda/storage/osinstall.py
+++ b/pyanaconda/storage/osinstall.py
@@ -406,7 +406,9 @@ class InstallerStorage(Blivet):
 
     def _get_container_name_template(self, prefix=None):
         """Return a template for suggest_container_name method."""
-        prefix = prefix or ""  # make sure prefix is a string instead of None
+        # Ensure 'qubes' prefix for R4.0 compatibility
+        # else it's set to 'qubesos' the product variable
+        prefix = "qubes"
 
         # try to create a device name incorporating the hostname
         hostname = self._get_hostname()
-- 
2.25.2