Make version required in core, with 43 as default
- Add version to required section in install and live templates - Set 43 as default version (overridable via modifiers) - Update CLI default from rawhide to 43
This commit is contained in:
@@ -244,7 +244,7 @@ class RecipeGenerator:
|
|||||||
modifiers['version'] = version
|
modifiers['version'] = version
|
||||||
|
|
||||||
# Keys that can be overridden by modifiers
|
# Keys that can be overridden by modifiers
|
||||||
override_keys = {'security', 'bootloader'}
|
override_keys = {'security', 'bootloader', 'version'}
|
||||||
|
|
||||||
# Add required includes
|
# Add required includes
|
||||||
for item in template.get('required', []):
|
for item in template.get('required', []):
|
||||||
@@ -585,8 +585,9 @@ def main():
|
|||||||
|
|
||||||
# Recipe parameters
|
# Recipe parameters
|
||||||
parser.add_argument('--version', '-v',
|
parser.add_argument('--version', '-v',
|
||||||
choices=['43', 'rawhide'], default='rawhide',
|
choices=['43', 'rawhide'], default='43',
|
||||||
help='Fedora version (default: rawhide)')
|
help='Fedora version (default: 43)')
|
||||||
|
|
||||||
parser.add_argument('--desktop',
|
parser.add_argument('--desktop',
|
||||||
choices=['gnome', 'labwc'],
|
choices=['gnome', 'labwc'],
|
||||||
default='gnome',
|
default='gnome',
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ templates:
|
|||||||
base: core
|
base: core
|
||||||
required:
|
required:
|
||||||
- core: fragments/core/base.ks
|
- core: fragments/core/base.ks
|
||||||
|
- version: fragments/repo/fedora-43-mirrors.ks
|
||||||
- storage: fragments/storage/standard.ks
|
- storage: fragments/storage/standard.ks
|
||||||
- bootloader: fragments/bootloader/grub.ks
|
- bootloader: fragments/bootloader/grub.ks
|
||||||
- locale: fragments/core/locale.ks
|
- locale: fragments/core/locale.ks
|
||||||
@@ -70,6 +71,7 @@ templates:
|
|||||||
base: live-core
|
base: live-core
|
||||||
required:
|
required:
|
||||||
- live-core: fragments/live/core/base.ks
|
- live-core: fragments/live/core/base.ks
|
||||||
|
- version: fragments/repo/fedora-43-mirrors.ks
|
||||||
- storage: fragments/live/core/storage.ks
|
- storage: fragments/live/core/storage.ks
|
||||||
- bootloader: fragments/live/core/bootloader/grub.ks
|
- bootloader: fragments/live/core/bootloader/grub.ks
|
||||||
- locale: fragments/core/locale.ks
|
- locale: fragments/core/locale.ks
|
||||||
|
|||||||
Reference in New Issue
Block a user