diff --git a/recipe-generator/generate_recipe.py b/recipe-generator/generate_recipe.py index a3d1ff2..c945527 100755 --- a/recipe-generator/generate_recipe.py +++ b/recipe-generator/generate_recipe.py @@ -244,7 +244,7 @@ class RecipeGenerator: modifiers['version'] = version # Keys that can be overridden by modifiers - override_keys = {'security', 'bootloader'} + override_keys = {'security', 'bootloader', 'version'} # Add required includes for item in template.get('required', []): @@ -585,8 +585,9 @@ def main(): # Recipe parameters parser.add_argument('--version', '-v', - choices=['43', 'rawhide'], default='rawhide', - help='Fedora version (default: rawhide)') + choices=['43', 'rawhide'], default='43', + help='Fedora version (default: 43)') + parser.add_argument('--desktop', choices=['gnome', 'labwc'], default='gnome', diff --git a/recipe-generator/recipe_templates.yaml b/recipe-generator/recipe_templates.yaml index 623ade6..ea4bcf9 100644 --- a/recipe-generator/recipe_templates.yaml +++ b/recipe-generator/recipe_templates.yaml @@ -10,6 +10,7 @@ templates: base: core required: - core: fragments/core/base.ks + - version: fragments/repo/fedora-43-mirrors.ks - storage: fragments/storage/standard.ks - bootloader: fragments/bootloader/grub.ks - locale: fragments/core/locale.ks @@ -70,6 +71,7 @@ templates: base: live-core required: - live-core: fragments/live/core/base.ks + - version: fragments/repo/fedora-43-mirrors.ks - storage: fragments/live/core/storage.ks - bootloader: fragments/live/core/bootloader/grub.ks - locale: fragments/core/locale.ks