Hide spokes in Silverblue and Workstation

Hide some of the spokes in variants Silverblue and Workstation Live.
rhinstaller · Jun 11, 2019 · 31ef00b · 31ef00b
1 parent e67f2c5
commit 31ef00b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst
@@ -74,7 +74,7 @@ fi
 if [ -f /etc/os-release ]; then
     variantid=$( grep VARIANT_ID /etc/os-release | tail -1 | cut -d= -f2)
     if [ "$variantid" = "workstation" ]; then
-        export ANACONDA_PRODUCTVARIANT="Workstation"
+        export ANACONDA_PRODUCTVARIANT="Workstation Live"
     fi
 fi
 

diff --git a/data/product.d/fedora-silverblue.conf b/data/product.d/fedora-silverblue.conf
@@ -6,4 +6,4 @@ variant_name = Silverblue
 
 [Base Product]
 product_name = Fedora
-variant_name = Workstation
+variant_name = Workstation Live
diff --git a/data/product.d/fedora-workstation-live.conf b/data/product.d/fedora-workstation-live.conf
@@ -0,0 +1,15 @@
+# Anaconda configuration file for Fedora Workstation Live.
+
+[Product]
+product_name = Fedora
+variant_name = Workstation Live
+
+[Base Product]
+product_name = Fedora
+variant_name = Workstation
+
+[User Interface]
+hidden_spokes =
+    NetworkSpoke
+    PasswordSpoke
+    UserSpoke
diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py
@@ -81,14 +81,19 @@ def fedora_products_test(self):
             "Fedora", "Workstation",
             ["fedora.conf", "fedora-workstation.conf"]
         )
+        self._check_default_product(
+            "Fedora", "Workstation Live",
+            ["fedora.conf", "fedora-workstation.conf", "fedora-workstation-live.conf"]
+        )
         self._check_default_product(
             "Fedora", "AtomicHost",
             ["fedora.conf", "fedora-atomic-host.conf"]
 
         )
         self._check_default_product(
             "Fedora", "Silverblue",
-            ["fedora.conf", "fedora-workstation.conf", "fedora-silverblue.conf"]
+            ["fedora.conf", "fedora-workstation.conf", "fedora-workstation-live.conf",
+             "fedora-silverblue.conf"]
         )
 
     def rhel_products_test(self):