diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst index 7a632fa3ae08..29fa95dcfc8b 100755 --- 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 index 15401c2bbc1c..c0bf3454cebf 100644 --- 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 new file mode 100644 index 000000000000..bfd7581275b2 --- /dev/null +++ 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 index 57f1c80ae504..00743ee45d56 100644 --- a/tests/nosetests/pyanaconda_tests/product_test.py +++ b/tests/nosetests/pyanaconda_tests/product_test.py @@ -81,6 +81,10 @@ 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"] @@ -88,7 +92,8 @@ def fedora_products_test(self): ) 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):