mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-11-21 12:41:25 +00:00
Resolve conflicts due merge #219
This commit is contained in:
parent
641128eebf
commit
c53003d3d5
@ -1047,7 +1047,8 @@
|
|||||||
},
|
},
|
||||||
"install_package_set_minimal": {
|
"install_package_set_minimal": {
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"rocky-package-set-x86_64-*-uefi": 30
|
"rocky-package-set-aarch64-*-aarch64": 30,
|
||||||
|
"rocky-package-set-x86_64-*-bios": 30
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"DESKTOP": "false",
|
"DESKTOP": "false",
|
||||||
@ -1056,7 +1057,8 @@
|
|||||||
},
|
},
|
||||||
"install_package_set_server": {
|
"install_package_set_server": {
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"rocky-package-set-x86_64-*-uefi": 30
|
"rocky-package-set-aarch64-*-aarch64": 30,
|
||||||
|
"rocky-package-set-x86_64-*-bios": 30
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"DESKTOP": "false",
|
"DESKTOP": "false",
|
||||||
@ -1065,7 +1067,8 @@
|
|||||||
},
|
},
|
||||||
"install_package_set_graphical-server": {
|
"install_package_set_graphical-server": {
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"rocky-package-set-x86_64-*-uefi": 30
|
"rocky-package-set-aarch64-*-aarch64": 30,
|
||||||
|
"rocky-package-set-x86_64-*-bios": 30
|
||||||
},
|
},
|
||||||
"settings": {
|
"settings": {
|
||||||
"DESKTOP": "gnome",
|
"DESKTOP": "gnome",
|
||||||
|
Loading…
Reference in New Issue
Block a user