testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

resolve mismatch of login type caused by incorrect template entries

Browse Source
This commit is contained in:
Trevor Cooper 2022-07-06 10:05:51 -07:00
parent ecd8dfee2d
commit cc940e5455
Signed by: tcooper
GPG Key ID: 52364D7BBCEB35B8
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.pm
View File

@ -249,13 +249,19 @@ sub _load_early_postinstall_tests {
# For now, there's no possibility to get a graphical desktop on # For now, there's no possibility to get a graphical desktop on
# Modular composes, so short-circuit here for those # Modular composes, so short-circuit here for those
# Rocky has no such thing as MODULAR composes. # Rocky has no such thing as MODULAR composes and we make use of PACKAGESET
if (!get_var("DESKTOP") || get_var("DESKTOP") eq "false") { # to select different Environments from the boot and/or DVD ISOs.
# DO NOT specify DESKTOP for minimal, server-product or virtualization-host
my $package_set = get_var("PACKAGE_SET");
if (!get_var("DESKTOP") || get_var("DESKTOP") eq "false" ||
$package_set eq "minimal" || $package_set eq "server" ||
$package_set eq "virtualization-host") {
_load_instance("tests/_console_wait_login", $instance); _load_instance("tests/_console_wait_login", $instance);
return; return;
} }
# Appropriate login method for install type # Explicitly setting DESKTOP="kde" or DESKTOP="gnome" should ALWAYS trigger
# graphical login...
if (get_var("DESKTOP")) { if (get_var("DESKTOP")) {
_load_instance("tests/_graphical_wait_login", $instance); _load_instance("tests/_graphical_wait_login", $instance);
} }

9
templates.fif.json
View File

@ -494,6 +494,7 @@
"rocky-dvd-iso-x86_64-*-64bit": 10 "rocky-dvd-iso-x86_64-*-64bit": 10
}, },
"settings": { "settings": {
"DESKTOP": "gnome",
"PACKAGE_SET": "default", "PACKAGE_SET": "default",
"POSTINSTALL": "_collect_data", "POSTINSTALL": "_collect_data",
"STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2" "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
@ -633,8 +634,8 @@
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"PACKAGE_SET": "minimal", "DESKTOP": "false",
"POSTINSTALL": "_console_login" "PACKAGE_SET": "minimal"
} }
}, },
"install_package_set_server": { "install_package_set_server": {
@ -648,8 +649,8 @@
"rocky-package-set-x86_64-*-64bit": 30 "rocky-package-set-x86_64-*-64bit": 30
}, },
"settings": { "settings": {
"PACKAGE_SET": "server", "DESKTOP": "false",
"POSTINSTALL": "_console_login" "PACKAGE_SET": "server"
} }
}, },
"install_package_set_graphical-server": { "install_package_set_graphical-server": {