Handle no root/user spokes in Silverblue installer

The root and user spokes got removed from the Silverblue
installer, so handle that the same way as Workstation live.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-06-28 10:03:03 -07:00
parent e1cad438ce
commit 67f41a47a2

11
main.pm
View File

@ -143,11 +143,12 @@ sub load_install_tests() {
# if this is a kickstart install, that's all folks # if this is a kickstart install, that's all folks
return if (get_var("KICKSTART")); return if (get_var("KICKSTART"));
# on Fedora 28+, root password and user creation spokes are # Root password and user creation spokes are suppressed on
# suppressed on Workstation live install, so we do not want to # Workstation live install and Silverblue DVD install, so we do
# try and use them. However we're also still testing F27 live # not want to try and use them. Setting this in the templates is
# respins, so we can't just do this in the templates yet, sadly. # tricky as it gets set for post-install tests too that way, and
if (get_var('LIVE') && get_var('DESKTOP') eq 'gnome') { # we don't want that
if ((get_var('LIVE') || get_var('CANNED')) && get_var('DESKTOP') eq 'gnome') {
set_var('INSTALLER_NO_ROOT', '1'); set_var('INSTALLER_NO_ROOT', '1');
# this is effectively a forced install_no_user # this is effectively a forced install_no_user
set_var('INSTALL_NO_USER', '1'); set_var('INSTALL_NO_USER', '1');