From 7ab3debd77e46aae6a395f2c3f5046c74680a3fc Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 8 Mar 2018 18:42:09 -0800
Subject: [PATCH] Try a different way of disabling root/user on Workstation
 live

Sigh, 'overloaded' product templates like that don't quite work.
So, let's try doing it a different way, in main.pm.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 main.pm   |  9 +++++++++
 templates | 34 ++--------------------------------
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/main.pm b/main.pm
index 81b3e80b..b87ea818 100644
--- a/main.pm
+++ b/main.pm
@@ -142,6 +142,15 @@ sub load_install_tests() {
     # if this is a kickstart install, that's all folks
     return if (get_var("KICKSTART"));
 
+    # on Fedora 28+, root password and user creation spokes are
+    # suppressed on Workstation live install, so we do not want to
+    # try and use them. However we're also still testing F27 live
+    # respins, so we can't just do this in the templates yet, sadly.
+    if (get_var('LIVE') && get_var('DESKTOP') eq 'gnome') {
+        set_var('ROOT_PASSWORD', 'false');
+        set_var('USER_LOGIN', 'false');
+    }
+
     if (get_var('ANACONDA_TEXT')) {
         # since it differs much, handle text installation separately
         autotest::loadtest "tests/install_text.pm";
diff --git a/templates b/templates
index dfce7b2e..375345ce 100755
--- a/templates
+++ b/templates
@@ -4273,21 +4273,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "x86_64",
-                      distri    => "fedora",
-                      flavor    => "Workstation-live-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "LIVE", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "DESKTOP", value => "gnome" },
-                        { key => "TEST_TARGET", value => "ISO" },
-                        { key => "ROOT_PASSWORD", => "false" },
-                        { key => "USER_LOGIN", => "false" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "x86_64",
                       distri    => "fedora",
@@ -4299,7 +4284,7 @@
                         { key => "DESKTOP", value => "gnome" },
                         { key => "TEST_TARGET", value => "ISO" }
                                    ],
-                      version   => "27",
+                      version   => "*",
                     },
                     {
                       arch      => "x86_64",
@@ -4365,21 +4350,6 @@
                                    ],
                       version   => "*",
                     },
-                    {
-                      arch      => "i386",
-                      distri    => "fedora",
-                      flavor    => "Workstation-live-iso",
-                      name      => "",
-                      settings  => [
-                        { key => "LIVE", value => "1" },
-                        { key => "PACKAGE_SET", value => "default" },
-                        { key => "DESKTOP", value => "gnome" },
-                        { key => "TEST_TARGET", value => "ISO" },
-                        { key => "ROOT_PASSWORD", => "false" },
-                        { key => "USER_LOGIN", => "false" }
-                                   ],
-                      version   => "*",
-                    },
                     {
                       arch      => "i386",
                       distri    => "fedora",
@@ -4391,7 +4361,7 @@
                         { key => "DESKTOP", value => "gnome" },
                         { key => "TEST_TARGET", value => "ISO" }
                                    ],
-                      version   => "27",
+                      version   => "*",
                     },
                     {
                       arch      => "i386",