From 520657dcee589b8a0fe7ed162daeec063b9ae50c Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Wed, 25 Mar 2026 19:15:32 +0100 Subject: [PATCH] recipe-generator: Update to new template structure with install and live templates - Replaced individual templates with unified 'install' (desktop, server, hypervisor) and 'live' (live-desktop, live-server) templates - Added new modifiers: variant_type, hypervisor-type, desktop, initial-setup, virtualization - Updated generate_recipe.py to handle new modifier structure with additive flags - Updated recipes_manifest.yaml with new modifier structure - Added missing fragment files and directories --- .../platform/generic-43/bootloader/grub.ks | 3 - .../generic-43/bootloader/systemd-boot.ks | 3 - .../generic-rawhide/bootloader/grub.ks | 3 - .../bootloader/systemd-boot.ks | 3 - fragments/shared/desktop/vmm/packages.ks | 70 +------ fragments/shared/desktop/vmm/post-scripts.ks | 59 +----- .../shared/initial-setup/desktop/config.ks | 26 +-- .../shared/initial-setup/desktop/packages.ks | 6 +- .../shared/initial-setup/gnome/config.ks | 25 +++ .../shared/initial-setup/gnome/packages.ks | 9 + fragments/shared/live/hypervisor.ks | 14 +- .../virtual-machine-manager/packages.ks | 5 + .../virtual-machine-manager/post-scripts.ks | 56 ++++++ fragments/shared/section-data/post/server.ks | 1 + recipe-generator/Makefile | 1 + .../generate_recipe.cpython-314.pyc | Bin 32631 -> 35768 bytes recipe-generator/generate_recipe.py | 151 +++++++++++--- recipe-generator/recipe_templates.yaml | 189 +++++------------- recipe-generator/recipes_manifest.yaml | 153 ++++++++------ recipes/desktop-hypervisor_rawhide.cfg | 30 --- ...-desktop_43.cfg => install_desktop_43.cfg} | 11 +- ...devel.cfg => install_desktop_43_devel.cfg} | 11 +- ...wc_43.cfg => install_desktop_labwc_43.cfg} | 11 +- ...awhide.cfg => install_desktop_rawhide.cfg} | 13 +- ... => install_desktop_rawhide_encrypted.cfg} | 15 +- ... => install_hypervisor_amdcpu_rawhide.cfg} | 18 +- ..._hypervisor_intelcpu_intelgpu_rawhide.cfg} | 18 +- ...> install_hypervisor_intelcpu_rawhide.cfg} | 18 +- ...al-server_43.cfg => install_server_43.cfg} | 7 +- ..._devel.cfg => install_server_43_devel.cfg} | 7 +- ...rawhide.cfg => install_server_rawhide.cfg} | 9 +- ...l.cfg => install_server_rawhide_devel.cfg} | 9 +- recipes/live-desktop_rawhide.cfg | 24 --- ...r_rawhide.cfg => live_desktop_rawhide.cfg} | 10 +- ...hypervisor.cfg => live_server_rawhide.cfg} | 9 +- 35 files changed, 465 insertions(+), 532 deletions(-) delete mode 100644 fragments/platform/generic-43/bootloader/grub.ks delete mode 100644 fragments/platform/generic-43/bootloader/systemd-boot.ks delete mode 100644 fragments/platform/generic-rawhide/bootloader/grub.ks delete mode 100644 fragments/platform/generic-rawhide/bootloader/systemd-boot.ks create mode 100644 fragments/shared/initial-setup/gnome/config.ks create mode 100644 fragments/shared/initial-setup/gnome/packages.ks create mode 100644 fragments/shared/packages/virtual-machine-manager/packages.ks create mode 100644 fragments/shared/packages/virtual-machine-manager/post-scripts.ks create mode 100644 fragments/shared/section-data/post/server.ks delete mode 100644 recipes/desktop-hypervisor_rawhide.cfg rename recipes/{virtual-desktop_43.cfg => install_desktop_43.cfg} (75%) rename recipes/{virtual-desktop_43_devel.cfg => install_desktop_43_devel.cfg} (75%) rename recipes/{virtual-desktop_labwc_43.cfg => install_desktop_labwc_43.cfg} (75%) rename recipes/{virtual-desktop_rawhide.cfg => install_desktop_rawhide.cfg} (81%) rename recipes/{virtual-desktop_rawhide_encrypted.cfg => install_desktop_rawhide_encrypted.cfg} (78%) rename recipes/{desktop-hypervisor_amdcpu_rawhide.cfg => install_hypervisor_amdcpu_rawhide.cfg} (65%) rename recipes/{desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg => install_hypervisor_intelcpu_intelgpu_rawhide.cfg} (66%) rename recipes/{desktop-hypervisor_intelcpu_rawhide.cfg => install_hypervisor_intelcpu_rawhide.cfg} (65%) rename recipes/{virtual-server_43.cfg => install_server_43.cfg} (79%) rename recipes/{virtual-server_43_devel.cfg => install_server_43_devel.cfg} (79%) rename recipes/{virtual-server_rawhide.cfg => install_server_rawhide.cfg} (85%) rename recipes/{virtual-server_rawhide_devel.cfg => install_server_rawhide_devel.cfg} (85%) delete mode 100644 recipes/live-desktop_rawhide.cfg rename recipes/{live-server_rawhide.cfg => live_desktop_rawhide.cfg} (78%) rename recipes/{live-server_rawhide_hypervisor.cfg => live_server_rawhide.cfg} (78%) diff --git a/fragments/platform/generic-43/bootloader/grub.ks b/fragments/platform/generic-43/bootloader/grub.ks deleted file mode 100644 index 54bb768..0000000 --- a/fragments/platform/generic-43/bootloader/grub.ks +++ /dev/null @@ -1,3 +0,0 @@ -# GRUB bootloader configuration for live media (no location, minimal timeout) - -bootsupport --timeout=1 # Set the GNU GRUB bootloader timeout to 1 and to location to none diff --git a/fragments/platform/generic-43/bootloader/systemd-boot.ks b/fragments/platform/generic-43/bootloader/systemd-boot.ks deleted file mode 100644 index 75a641a..0000000 --- a/fragments/platform/generic-43/bootloader/systemd-boot.ks +++ /dev/null @@ -1,3 +0,0 @@ -# systemd-boot bootloader configuration for live media (no location, minimal timeout) - -bootsupport --sdboot --location=none --timeout=1 # Use systemd-boot and set location to none diff --git a/fragments/platform/generic-rawhide/bootloader/grub.ks b/fragments/platform/generic-rawhide/bootloader/grub.ks deleted file mode 100644 index 54bb768..0000000 --- a/fragments/platform/generic-rawhide/bootloader/grub.ks +++ /dev/null @@ -1,3 +0,0 @@ -# GRUB bootloader configuration for live media (no location, minimal timeout) - -bootsupport --timeout=1 # Set the GNU GRUB bootloader timeout to 1 and to location to none diff --git a/fragments/platform/generic-rawhide/bootloader/systemd-boot.ks b/fragments/platform/generic-rawhide/bootloader/systemd-boot.ks deleted file mode 100644 index 75a641a..0000000 --- a/fragments/platform/generic-rawhide/bootloader/systemd-boot.ks +++ /dev/null @@ -1,3 +0,0 @@ -# systemd-boot bootloader configuration for live media (no location, minimal timeout) - -bootsupport --sdboot --location=none --timeout=1 # Use systemd-boot and set location to none diff --git a/fragments/shared/desktop/vmm/packages.ks b/fragments/shared/desktop/vmm/packages.ks index 44eb336..e6cae5c 100644 --- a/fragments/shared/desktop/vmm/packages.ks +++ b/fragments/shared/desktop/vmm/packages.ks @@ -1,68 +1,8 @@ -%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. +# VMM (Virtual Machine Manager) packages -virt-manager # Install virt-manager, a graphical front-end for QEMU/KVM +%packages --exclude-weakdeps + +virtual-manager +libvirt-client-tools %end - -%post --nochroot --log=/mnt/sysimage/root/virt-manager-post.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. - -# Create a file to autostart virt-manager -cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF -[Desktop Entry] -Type=Application -Name=Virtual Machine Manager -Exec=virt-manager -EOF - -# Modify the default virt-manager behavior for misc. options -cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF - -# Modify the default virt-manager behavior for misc. options -[org.virt-manager.virt-manager] -xmleditor-enabled=true -manager-window-height=600 -manager-window-width=200 - -# Libvirt URIs listed in the manager window -[org.virt-manager.virt-manager.connections] -uris=['qemu:///system', 'qemu:///session'] -autoconnect=['qemu:///session'] - -# Show usage in the domain list -[org.virt-manager.virt-manager.vmlist-fields] -cpu-usage=false - -# Settings related to statistics -[org.virt-manager.virt-manager.stats] -update-interval=3 -enable-disk-poll=true -enable-memory-poll=true -enable-net-poll=true - -# Default behavior for the console -[org.virt-manager.virt-manager.console] -scaling=2 -resize-guest=1 -autoconnect=false - -# Do not show toolbar -[org.virt-manager.virt-manager.details] -show-toolbar=false - -# Modify default values for new VMs -[org.virt-manager.virt-manager.new-vm] -storage-format='raw' -cpu-default='host-model' -graphics-type='spice' - -# Modify the default virt-manager behavior for confirmation dialogues -[org.virt-manager.virt-manager.confirm] -forcepoweroff=false -removedev=false -unapplied-dev=false - -EOF - -glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ - -%end # End of the %post section diff --git a/fragments/shared/desktop/vmm/post-scripts.ks b/fragments/shared/desktop/vmm/post-scripts.ks index ee900ab..39bebbb 100644 --- a/fragments/shared/desktop/vmm/post-scripts.ks +++ b/fragments/shared/desktop/vmm/post-scripts.ks @@ -1,56 +1,9 @@ -# Virt-manager post-installation configuration +# VMM post-installation scripts -%post --nochroot --log=/mnt/sysimage/root/vmm-post-scripts.log # Beginning of %post section +%post --erroronfail -# Create a file to autostart virt-manager -cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF -[Desktop Entry] -Type=Application -Name=Virtual Machine Manager -Exec=virt-manager -EOF +# Start libvirt service +systemctl enable libvirtd +systemctl start libvirtd -# Modify the default virt-manager behavior for misc. options -cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF - -[org.virt-manager.virt-manager] -xmleditor-enabled=true -manager-window-height=600 -manager-window-width=200 - -[org.virt-manager.virt-manager.connections] -uris=['qemu:///system', 'qemu:///session'] -autoconnect=['qemu:///session'] - -[org.virt-manager.virt-manager.vmlist-fields] -cpu-usage=false - -[org.virt-manager.virt-manager.stats] -update-interval=3 -enable-disk-poll=true -enable-memory-poll=true -enable-net-poll=true - -[org.virt-manager.virt-manager.console] -scaling=2 -resize-guest=1 -autoconnect=false - -[org.virt-manager.virt-manager.details] -show-toolbar=false - -[org.virt-manager.virt-manager.new-vm] -storage-format='raw' -cpu-default='host-model' -graphics-type='spice' - -[org.virt-manager.virt-manager.confirm] -forcepoweroff=false -removedev=false -unapplied-dev=false - -EOF - -glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ - -%end # End of the %post section +%end diff --git a/fragments/shared/initial-setup/desktop/config.ks b/fragments/shared/initial-setup/desktop/config.ks index 857860f..8ea1a37 100644 --- a/fragments/shared/initial-setup/desktop/config.ks +++ b/fragments/shared/initial-setup/desktop/config.ks @@ -1,25 +1 @@ -# Initial setup - GNOME desktop mode - -firstboot --enable # Initial Setup will start after the first reboot - -%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. - -# TO BE TESTED -> initial-setup-gui # Graphical user interface for the initial-setup utility -# TO BE TESTED -> initial-setup-gui-wayland-generic.x86_64 # Run the initial-setup GUI in Wayland -gnome-initial-setup # Add GNOME initial setup too to let user create local account. - -%end # End of the packages section - -# %post --nochroot --log=/mnt/sysimage/root/initial-setup-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. -# -# truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available -# -# ## Append lines to existing vendor.conf file, so that options are skipped upon reboot -# cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF -# [pages] -# skip=privacy -# [goa] -# providers=local-first! -# EOF -# -# %end # End of the %post section +# Desktop initial-setup configuration diff --git a/fragments/shared/initial-setup/desktop/packages.ks b/fragments/shared/initial-setup/desktop/packages.ks index 1bd0545..aa29e8c 100644 --- a/fragments/shared/initial-setup/desktop/packages.ks +++ b/fragments/shared/initial-setup/desktop/packages.ks @@ -1,9 +1,7 @@ -# Initial setup packages - GNOME desktop mode +# Initial setup packages - desktop mode %packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. -# TO BE TESTED -> initial-setup-gui # Graphical user interface for the initial-setup utility -# TO BE TESTED -> initial-setup-gui-wayland-generic.x86_64 # Run the initial-setup GUI in Wayland -gnome-initial-setup # Add GNOME initial setup too to let user create local account. +initial-setup # Initial setup package %end # End of the packages section diff --git a/fragments/shared/initial-setup/gnome/config.ks b/fragments/shared/initial-setup/gnome/config.ks new file mode 100644 index 0000000..857860f --- /dev/null +++ b/fragments/shared/initial-setup/gnome/config.ks @@ -0,0 +1,25 @@ +# Initial setup - GNOME desktop mode + +firstboot --enable # Initial Setup will start after the first reboot + +%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. + +# TO BE TESTED -> initial-setup-gui # Graphical user interface for the initial-setup utility +# TO BE TESTED -> initial-setup-gui-wayland-generic.x86_64 # Run the initial-setup GUI in Wayland +gnome-initial-setup # Add GNOME initial setup too to let user create local account. + +%end # End of the packages section + +# %post --nochroot --log=/mnt/sysimage/root/initial-setup-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. +# +# truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available +# +# ## Append lines to existing vendor.conf file, so that options are skipped upon reboot +# cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF +# [pages] +# skip=privacy +# [goa] +# providers=local-first! +# EOF +# +# %end # End of the %post section diff --git a/fragments/shared/initial-setup/gnome/packages.ks b/fragments/shared/initial-setup/gnome/packages.ks new file mode 100644 index 0000000..1bd0545 --- /dev/null +++ b/fragments/shared/initial-setup/gnome/packages.ks @@ -0,0 +1,9 @@ +# Initial setup packages - GNOME desktop mode + +%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. + +# TO BE TESTED -> initial-setup-gui # Graphical user interface for the initial-setup utility +# TO BE TESTED -> initial-setup-gui-wayland-generic.x86_64 # Run the initial-setup GUI in Wayland +gnome-initial-setup # Add GNOME initial setup too to let user create local account. + +%end # End of the packages section diff --git a/fragments/shared/live/hypervisor.ks b/fragments/shared/live/hypervisor.ks index 2b0c12e..e49e894 100644 --- a/fragments/shared/live/hypervisor.ks +++ b/fragments/shared/live/hypervisor.ks @@ -1,10 +1,14 @@ -# Hypervisor package inclusion for live server - -%packages --exclude-weakdeps +# Live desktop hypervisor configuration +# Enable virtualization support in live environment +%packages qemu-kvm -libvirt libvirt-client virt-install - +%end + +%post --erroronfail +# Setup libvirt for live environment +mkdir -p /var/lib/libvirt +systemctl enable libvirtd %end diff --git a/fragments/shared/packages/virtual-machine-manager/packages.ks b/fragments/shared/packages/virtual-machine-manager/packages.ks new file mode 100644 index 0000000..084b2fc --- /dev/null +++ b/fragments/shared/packages/virtual-machine-manager/packages.ks @@ -0,0 +1,5 @@ +%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. + +virt-manager # Install virt-manager, a graphical front-end for QEMU/KVM + +%end \ No newline at end of file diff --git a/fragments/shared/packages/virtual-machine-manager/post-scripts.ks b/fragments/shared/packages/virtual-machine-manager/post-scripts.ks new file mode 100644 index 0000000..ee900ab --- /dev/null +++ b/fragments/shared/packages/virtual-machine-manager/post-scripts.ks @@ -0,0 +1,56 @@ +# Virt-manager post-installation configuration + +%post --nochroot --log=/mnt/sysimage/root/vmm-post-scripts.log # Beginning of %post section + +# Create a file to autostart virt-manager +cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF +[Desktop Entry] +Type=Application +Name=Virtual Machine Manager +Exec=virt-manager +EOF + +# Modify the default virt-manager behavior for misc. options +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF + +[org.virt-manager.virt-manager] +xmleditor-enabled=true +manager-window-height=600 +manager-window-width=200 + +[org.virt-manager.virt-manager.connections] +uris=['qemu:///system', 'qemu:///session'] +autoconnect=['qemu:///session'] + +[org.virt-manager.virt-manager.vmlist-fields] +cpu-usage=false + +[org.virt-manager.virt-manager.stats] +update-interval=3 +enable-disk-poll=true +enable-memory-poll=true +enable-net-poll=true + +[org.virt-manager.virt-manager.console] +scaling=2 +resize-guest=1 +autoconnect=false + +[org.virt-manager.virt-manager.details] +show-toolbar=false + +[org.virt-manager.virt-manager.new-vm] +storage-format='raw' +cpu-default='host-model' +graphics-type='spice' + +[org.virt-manager.virt-manager.confirm] +forcepoweroff=false +removedev=false +unapplied-dev=false + +EOF + +glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ + +%end # End of the %post section diff --git a/fragments/shared/section-data/post/server.ks b/fragments/shared/section-data/post/server.ks new file mode 100644 index 0000000..6b196c6 --- /dev/null +++ b/fragments/shared/section-data/post/server.ks @@ -0,0 +1 @@ +# Server-specific post-install tasks diff --git a/recipe-generator/Makefile b/recipe-generator/Makefile index bfdce20..f5c721e 100644 --- a/recipe-generator/Makefile +++ b/recipe-generator/Makefile @@ -16,6 +16,7 @@ install-deps: pip install -r requirements.txt generate-recipes: + rm -f ../recipes/*.cfg python generate_recipe.py \ --manifest recipes_manifest.yaml \ --output-dir ../recipes/ diff --git a/recipe-generator/__pycache__/generate_recipe.cpython-314.pyc b/recipe-generator/__pycache__/generate_recipe.cpython-314.pyc index 39877538ec7eeccc5794e45bdbbe29e5617546d2..c45868fdd011603f49d3d88cfcd1ac61afeeb9fa 100644 GIT binary patch delta 6554 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 QAn9YHsHMZWbtL|O0QS+zPXGV_ delta 4088 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 List[str]: """Validate manifest structure.""" errors = [] @@ -175,6 +189,11 @@ class RecipeGenerator: for variant in recipe_config['variants']: if 'version' not in variant: errors.append(f"Recipe '{recipe_config['name']}' variant missing 'version'") + # Support explicit variant name for install variants + if 'name' in variant: + variant_subname = variant['name'] + else: + variant_subname = '' return errors @@ -238,27 +257,86 @@ class RecipeGenerator: for opt_key, opt_config in template.get('optional', {}).items(): if opt_key in modifiers: value = modifiers[opt_key] - if isinstance(opt_config, dict): + + # Case 1: opt_config is nested dict (e.g., virtualization, variant_type) + # and value is string/int (select from options) + if isinstance(opt_config, dict) and not isinstance(value, (dict, list)): if value in opt_config: fragment_path = opt_config[value] - if fragment_path not in seen: + if isinstance(fragment_path, list): + for fp in fragment_path: + if fp is not None and fp not in seen: + includes.append(f"%ksappend {fp}") + seen.add(fp) + elif fragment_path and fragment_path not in seen: includes.append(f"%ksappend {fragment_path}") seen.add(fragment_path) + + # Case 2: opt_config is nested dict (e.g., virtualization) + # and value is dict (nested structure) + elif isinstance(opt_config, dict) and isinstance(value, dict): + for nested_key in value: + if nested_key in opt_config: + nested_value = opt_config[nested_key] + if isinstance(nested_value, list): + for fp in nested_value: + if fp is not None and fp not in seen: + includes.append(f"%ksappend {fp}") + seen.add(fp) + elif nested_value is not None and nested_value not in seen: + includes.append(f"%ksappend {nested_value}") + seen.add(nested_value) + + # Case 3: opt_config is nested dict, value is boolean (additive) + elif isinstance(opt_config, dict) and isinstance(value, bool) and value: + for nested_key, nested_value in opt_config.items(): + if isinstance(nested_value, list): + for fp in nested_value: + if fp is not None and fp not in seen: + includes.append(f"%ksappend {fp}") + seen.add(fp) + elif nested_value is not None and nested_value not in seen: + includes.append(f"%ksappend {nested_value}") + seen.add(nested_value) + + # Case 4: opt_config is list, value is boolean (boolean flag) elif isinstance(opt_config, list) and value is True: for fragment_path in opt_config: - if fragment_path not in seen: + if fragment_path is not None and fragment_path not in seen: includes.append(f"%ksappend {fragment_path}") seen.add(fragment_path) - - # Handle special modifiers (CPU, GPU) + + # Handle modifiers section for mod_key, mod_value in modifiers.items(): if mod_key in template.get('modifiers', {}): mod_config = template['modifiers'][mod_key] - if isinstance(mod_config, dict) and mod_value in mod_config: - fragment_path = mod_config[mod_value] - if fragment_path and fragment_path not in seen: - includes.append(f"%ksappend {fragment_path}") - seen.add(fragment_path) + + # Handle nested dict modifiers + if isinstance(mod_config, dict) and isinstance(mod_value, str): + if mod_value in mod_config: + fragment_path = mod_config[mod_value] + if isinstance(fragment_path, list): + for fp in fragment_path: + if fp is not None and fp not in seen: + includes.append(f"%ksappend {fp}") + seen.add(fp) + elif fragment_path and fragment_path not in seen: + includes.append(f"%ksappend {fragment_path}") + seen.add(fragment_path) + + # Handle list modifiers + elif isinstance(mod_config, dict) and isinstance(mod_value, list): + for item in mod_value: + if item in mod_config: + fragment_path = mod_config[item] + if isinstance(fragment_path, list): + for fp in fragment_path: + if fp is not None and fp not in seen: + includes.append(f"%ksappend {fp}") + seen.add(fp) + elif fragment_path and fragment_path not in seen: + includes.append(f"%ksappend {fragment_path}") + seen.add(fragment_path) return includes @@ -380,14 +458,20 @@ class RecipeGenerator: def generate_filename(self, recipe_type: str, version: str, **modifiers) -> str: """Generate recipe filename from parameters.""" - # Map modifiers to filename components + # Extract variant subname if present + variant_subname = modifiers.get('variant_subname', '') + + # Build base parts parts = [recipe_type.replace('_', '-')] - # Add CPU/GPU first (hypervisors) - if modifiers.get('cpu') and modifiers.get('cpu') != 'generic': - parts.append(modifiers['cpu']) - if modifiers.get('gpu') and modifiers.get('gpu') != 'none': - parts.append(modifiers['gpu']) + # Add variant subname for install variants (desktop, server, hypervisor) + if variant_subname and variant_subname in ['desktop', 'server', 'hypervisor']: + parts.append(variant_subname) + + # Add hypervisor-type (list, first type only for filename) + if modifiers.get('hypervisor-type') and isinstance(modifiers['hypervisor-type'], list): + types = modifiers['hypervisor-type'] + parts.extend(types) # Add desktop (non-GNOME only, since GNOME is default) if modifiers.get('desktop') and modifiers['desktop'] != 'gnome': @@ -396,10 +480,6 @@ class RecipeGenerator: # Add version parts.append(str(version)) - # Add hypervisor suffix (only when hypervisor is enabled) - if modifiers.get('hypervisor'): - parts.append('hypervisor') - # Add security suffix (devel only, since secure is default) if modifiers.get('security') == 'devel': parts.append('devel') @@ -450,6 +530,7 @@ def main(): help='Fedora version (default: rawhide)') parser.add_argument('--desktop', choices=['gnome', 'labwc'], + default='gnome', help='Desktop environment (default: gnome)') parser.add_argument('--storage', choices=['standard', 'encrypted'], @@ -571,7 +652,16 @@ def main(): for variant in recipe_config.get('variants', []): version = variant['version'] - modifiers = {k: v for k, v in variant.items() if k not in ['version']} + # Build modifiers dict (exclude 'name', 'version') + modifiers = {k: v for k, v in variant.items() if k not in ['name', 'version']} + # Extract subname (variant name) if present, otherwise empty + variant_subname = variant.get('name', '') + # Use variant_name as variant_type modifier + if variant_subname: + modifiers['variant_type'] = variant_subname + # Add variant_subname to modifiers for generate_filename + if variant_subname: + modifiers['variant_subname'] = variant_subname content = generator.generate_recipe(recipe_type, version, **modifiers) @@ -600,7 +690,8 @@ def main(): # Single generation mode if args.type: modifiers = { - 'desktop': args.desktop if args.desktop and args.desktop != 'gnome' else None, + 'variant_type': 'desktop', + 'desktop': args.desktop if args.desktop else None, 'storage': args.storage if args.storage != 'standard' else None, 'security': args.security if args.security != 'secure' else None, 'cpu': args.cpu if args.cpu and args.cpu != 'generic' else None, diff --git a/recipe-generator/recipe_templates.yaml b/recipe-generator/recipe_templates.yaml index 3e04405..3fcbd50 100644 --- a/recipe-generator/recipe_templates.yaml +++ b/recipe-generator/recipe_templates.yaml @@ -4,183 +4,94 @@ # Fragment paths use relative paths from project root templates: - # Virtual desktop recipe - # Modifiers: desktop (gnome|labwc), storage (standard|encrypted), - # security (secure|devel), version (43|rawhide), post (true|false) - virtual-desktop: - description: "A recipe for a virtual desktop" + # Install recipe - for desktop, server, or hypervisor + install: + description: "An install recipe for desktop, server, or hypervisor" base: core required: - core: fragments/shared/core/base.ks - storage: fragments/shared/storage/standard.ks - - bootloader: fragments/platform/generic-43/bootloader/grub.ks + - bootloader: fragments/shared/bootloader/grub.ks - locale: fragments/shared/core/locale.ks - services: fragments/shared/core/services.ks - network: fragments/shared/core/network.ks - packages: fragments/shared/packages/core-group.ks - fedora-remix: fragments/shared/packages/fedora-remix.ks - hand-picked: fragments/shared/packages/hand-picked.ks - - initial-setup: fragments/shared/initial-setup/server/config.ks optional: - security: - secure: fragments/shared/core/security/enabled.ks - devel: fragments/shared/core/security/disabled.ks + hardware-support: fragments/shared/packages/hardware-support.ks + variant_type: + desktop: + - fragments/shared/desktop/gnome/packages.ks + - fragments/shared/desktop/gnome/post-scripts.ks + server: + hypervisor: + - fragments/shared/hypervisor/base/packages.ks + - fragments/shared/hypervisor/base/services.ks + - fragments/shared/hypervisor/base/post-scripts.ks + - fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks + - fragments/shared/packages/virtual-machine-manager/packages.ks + - fragments/shared/packages/virtual-machine-manager/post-scripts.ks + - fragments/shared/guest-agents/packages.ks + modifiers: version: "43": fragments/platform/generic-43/repo/fedora-mirrors.ks "rawhide": fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks + storage: + standard: fragments/shared/storage/standard.ks + encrypted: fragments/shared/storage/encrypted.ks + bootloader: + grub: fragments/shared/bootloader/grub.ks + systemd-boot: fragments/shared/bootloader/systemd-boot.ks desktop: - gnome: fragments/shared/desktop/gnome/packages.ks - labwc: fragments/shared/desktop/labwc/config.ks - post: fragments/shared/section-data/post/base.ks - extras: - - fragments/shared/guest-agents/packages.ks - modifiers: - storage: - standard: fragments/shared/storage/standard.ks - encrypted: fragments/shared/storage/encrypted.ks - bootloader: - systemd-boot: fragments/platform/generic-43/bootloader/systemd-boot.ks - - # Virtual server recipe - # Modifiers: security (secure|devel), version (43|rawhide), post (true|false) - virtual-server: - description: "A recipe for a virtual server" - base: core - required: - - core: fragments/shared/core/base.ks - - storage: fragments/shared/storage/standard.ks - - bootloader: fragments/platform/generic-43/bootloader/grub.ks - - locale: fragments/shared/core/locale.ks - - services: fragments/shared/core/services.ks - - network: fragments/shared/core/network.ks - - packages: fragments/shared/packages/core-group.ks - - fedora-remix: fragments/shared/packages/fedora-remix.ks - - hand-picked: fragments/shared/packages/hand-picked.ks - - initial-setup: fragments/shared/initial-setup/server/config.ks - optional: + gnome: + - fragments/shared/desktop/gnome/config.ks + - fragments/shared/desktop/gnome/packages.ks + - fragments/shared/desktop/gnome/post-scripts.ks + labwc: + - fragments/shared/desktop/labwc/config.ks security: secure: fragments/shared/core/security/enabled.ks devel: fragments/shared/core/security/disabled.ks - version: - "43": fragments/platform/generic-43/repo/fedora-mirrors.ks - "rawhide": fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks - post: fragments/shared/section-data/post/base.ks - extras: - - fragments/shared/guest-agents/packages.ks - modifiers: - storage: - standard: fragments/shared/storage/standard.ks - encrypted: fragments/shared/storage/encrypted.ks - bootloader: - systemd-boot: fragments/platform/generic-43/bootloader/systemd-boot.ks - - # Desktop hypervisor recipe - # Modifiers: cpu (generic|amdcpu|intelcpu), gpu (none|intelgpu), - # security (secure|devel), version (rawhide), post (true|false) - desktop-hypervisor: - description: "A recipe for a desktop hypervisor" - base: core - required: - - core: fragments/shared/core/base.ks - - storage: fragments/shared/storage/standard.ks - - bootloader: fragments/platform/generic-rawhide/bootloader/grub.ks - - locale: fragments/shared/core/locale.ks - - services: fragments/shared/core/services.ks - - network: fragments/shared/core/network.ks - - packages: fragments/shared/packages/core-group.ks - - fedora-remix: fragments/shared/packages/fedora-remix.ks - - hand-picked: fragments/shared/packages/hand-picked.ks - - hardware-support: fragments/shared/packages/hardware-support.ks - - initial-setup: fragments/shared/initial-setup/desktop/config.ks - - desktop: fragments/shared/desktop/gnome/config.ks - - desktop-gnome-packages: fragments/shared/desktop/gnome/packages.ks - - desktop-gnome-post: fragments/shared/desktop/gnome/post-scripts.ks - - vmm: fragments/shared/desktop/vmm/packages.ks - - vmm-post: fragments/shared/desktop/vmm/post-scripts.ks - - repo: fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks - - hypervisor-base-services: fragments/shared/hypervisor/base/services.ks - - hypervisor-base-packages: fragments/shared/hypervisor/base/packages.ks - - hypervisor-base-post: fragments/shared/hypervisor/base/post-scripts.ks - optional: - security: - secure: fragments/shared/core/security/enabled.ks - devel: fragments/shared/core/security/disabled.ks - cpu: - generic: fragments/shared/hypervisor/base/services.ks + initial-setup: + server: fragments/shared/initial-setup/server/config.ks + desktop: fragments/shared/initial-setup/desktop/config.ks + hypervisor-type: amdcpu: fragments/shared/hypervisor/amdcpu.ks intelcpu: fragments/shared/hypervisor/intelcpu.ks - gpu: intelgpu: fragments/shared/hypervisor/intelgpu.ks - post: fragments/shared/section-data/post/base.ks - modifiers: - cpu: - generic: fragments/shared/hypervisor/base/services.ks - amdcpu: fragments/shared/hypervisor/amdcpu.ks - intelcpu: fragments/shared/hypervisor/intelcpu.ks - gpu: - none: null - intelgpu: fragments/shared/hypervisor/intelgpu.ks - storage: - standard: fragments/shared/storage/standard.ks - encrypted: fragments/shared/storage/encrypted.ks - # Live desktop recipe - # Modifiers: desktop (gnome|none), security (secure|devel), version (rawhide) - live-desktop: - description: "A recipe for a live desktop" + # Live recipe - for live-desktop or live-server + live: + description: "A live recipe for live-desktop or live-server" base: live-core required: - live-core: fragments/shared/live/core/base.ks - storage: fragments/shared/live/core/storage.ks - - bootloader: fragments/platform/generic-rawhide/bootloader/grub.ks + - bootloader: fragments/shared/bootloader/grub.ks - locale: fragments/shared/core/locale.ks - services: fragments/shared/core/services.ks - network: fragments/shared/core/network.ks - packages: fragments/shared/live/core/packages.ks - - mandatory: fragments/shared/live/core/packages.ks - post: fragments/shared/live/post/base.ks - session: fragments/shared/live/post/session.ks - - initial-setup: fragments/shared/initial-setup/desktop/config.ks - - desktop: fragments/shared/desktop/gnome/config.ks - - desktop-gnome-packages: fragments/shared/desktop/gnome/packages.ks - - desktop-gnome-post: fragments/shared/desktop/gnome/post-scripts.ks - - repo: fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks optional: + variant_type: + desktop: + - fragments/shared/desktop/gnome/packages.ks + server: security: secure: fragments/shared/core/security/enabled.ks devel: fragments/shared/core/security/disabled.ks - packages-hw: fragments/shared/packages/hardware-support.ks - extras: fragments/shared/guest-agents/packages.ks - modifiers: - storage: - standard: fragments/shared/live/core/storage.ks - encrypted: fragments/shared/live/core/storage.ks - - # Live server recipe - # Modifiers: security (secure|devel), version (rawhide), hypervisor (true|false) - live-server: - description: "A recipe for a live server" - base: live-core - required: - - live-core: fragments/shared/live/core/base.ks - - storage: fragments/shared/live/core/storage.ks - - bootloader: fragments/platform/generic-rawhide/bootloader/grub.ks - - locale: fragments/shared/core/locale.ks - - services: fragments/shared/core/services.ks - - network: fragments/shared/core/network.ks - - packages: fragments/shared/live/core/packages.ks - - mandatory: fragments/shared/live/core/packages.ks - - post: fragments/shared/live/post/base.ks - - session: fragments/shared/live/post/session.ks - - initial-setup: fragments/shared/initial-setup/server/config.ks - - repo: fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks - optional: - security: - secure: fragments/shared/core/security/enabled.ks - devel: fragments/shared/core/security/disabled.ks - packages-hw: fragments/shared/packages/hardware-support.ks + hardware-support: fragments/shared/packages/hardware-support.ks hypervisor: fragments/shared/live/hypervisor.ks modifiers: + version: + "43": fragments/platform/generic-43/repo/fedora-mirrors.ks + "rawhide": fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks storage: standard: fragments/shared/live/core/storage.ks encrypted: fragments/shared/live/core/storage.ks + bootloader: + grub: fragments/shared/bootloader/grub.ks + systemd-boot: fragments/shared/bootloader/systemd-boot.ks diff --git a/recipe-generator/recipes_manifest.yaml b/recipe-generator/recipes_manifest.yaml index 560950c..56d46c8 100644 --- a/recipe-generator/recipes_manifest.yaml +++ b/recipe-generator/recipes_manifest.yaml @@ -3,85 +3,126 @@ # Edit this file to add new variants, then run: make generate-recipes recipes: - # Virtual Desktop variants - - name: virtual-desktop + # Install variants - desktop + - name: install variants: - - version: 43 + - name: desktop + version: 43 desktop: gnome storage: standard + bootloader: grub security: secure - extras: true - - version: 43 + hardware-support: true + initial-setup: server + - name: desktop + version: 43 desktop: gnome storage: standard + bootloader: grub security: devel - extras: true - - version: 43 + hardware-support: true + initial-setup: server + - name: desktop + version: 43 desktop: labwc storage: standard + bootloader: grub security: secure - extras: true - - version: rawhide + hardware-support: true + initial-setup: server + - name: desktop + version: rawhide desktop: gnome storage: standard + bootloader: grub security: secure - extras: true - - version: rawhide + hardware-support: true + initial-setup: server + - name: desktop + version: rawhide desktop: gnome storage: encrypted + bootloader: grub security: secure - extras: true + hardware-support: true + initial-setup: server - # Virtual Server variants - - name: virtual-server + # Install variants - server (minimal, no desktop packages) + - name: install variants: - - version: 43 + - name: server + version: 43 + storage: standard + bootloader: grub security: secure - extras: true - post: true - - version: 43 + hardware-support: true + initial-setup: server + - name: server + version: 43 + storage: standard + bootloader: grub security: devel - extras: true - post: false - - version: rawhide + hardware-support: true + initial-setup: server + - name: server + version: rawhide + storage: standard + bootloader: grub security: secure - extras: true - post: true - - version: rawhide + hardware-support: true + initial-setup: server + - name: server + version: rawhide + storage: standard + bootloader: grub security: devel - extras: true - post: false + hardware-support: true + initial-setup: server - # Desktop Hypervisor variants - - name: desktop-hypervisor + # Install variants - hypervisor + - name: install variants: - - version: rawhide + - name: hypervisor + version: rawhide + storage: standard + bootloader: grub security: secure - - version: rawhide - cpu: amdcpu - security: secure - - version: rawhide - cpu: intelcpu - security: secure - - version: rawhide - cpu: intelcpu - gpu: intelgpu - security: secure - - # Live Desktop variants - - name: live-desktop - variants: - - version: rawhide - security: secure - packages-hw: true - - # Live Server variants - - name: live-server - variants: - - version: rawhide - security: secure - packages-hw: true - - version: rawhide - security: secure - packages-hw: true + hardware-support: true hypervisor: true + hypervisor-type: + - amdcpu + - name: hypervisor + version: rawhide + storage: standard + bootloader: grub + security: secure + hardware-support: true + hypervisor: true + hypervisor-type: + - intelcpu + - name: hypervisor + version: rawhide + storage: standard + bootloader: grub + security: secure + hardware-support: true + hypervisor: true + hypervisor-type: + - intelcpu + - intelgpu + + # Live variants - desktop + - name: live + variants: + - name: desktop + version: rawhide + security: secure + hardware-support: true + + # Live variants - server + - name: live + variants: + - name: server + version: rawhide + security: secure + hardware-support: true diff --git a/recipes/desktop-hypervisor_rawhide.cfg b/recipes/desktop-hypervisor_rawhide.cfg deleted file mode 100644 index fccd321..0000000 --- a/recipes/desktop-hypervisor_rawhide.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a desktop hypervisor - -%ksappend fragments/shared/core/base.ks -%ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks -%ksappend fragments/shared/core/locale.ks -%ksappend fragments/shared/core/services.ks -%ksappend fragments/shared/core/network.ks -%ksappend fragments/shared/packages/core-group.ks -%ksappend fragments/shared/packages/fedora-remix.ks -%ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/packages/hardware-support.ks -%ksappend fragments/shared/initial-setup/desktop/config.ks -%ksappend fragments/shared/desktop/gnome/config.ks -%ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/desktop/gnome/post-scripts.ks -%ksappend fragments/shared/desktop/vmm/packages.ks -%ksappend fragments/shared/desktop/vmm/post-scripts.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/hypervisor/base/services.ks -%ksappend fragments/shared/hypervisor/base/packages.ks -%ksappend fragments/shared/hypervisor/base/post-scripts.ks -%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_43.cfg b/recipes/install_desktop_43.cfg similarity index 75% rename from recipes/virtual-desktop_43.cfg rename to recipes/install_desktop_43.cfg index a56b2c3..7c4af58 100644 --- a/recipes/virtual-desktop_43.cfg +++ b/recipes/install_desktop_43.cfg @@ -5,18 +5,19 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/shared/core/security/enabled.ks %ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/initial-setup/server/config.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_43_devel.cfg b/recipes/install_desktop_43_devel.cfg similarity index 75% rename from recipes/virtual-desktop_43_devel.cfg rename to recipes/install_desktop_43_devel.cfg index c44c587..9afee48 100644 --- a/recipes/virtual-desktop_43_devel.cfg +++ b/recipes/install_desktop_43_devel.cfg @@ -5,18 +5,19 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/shared/core/security/disabled.ks %ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/core/security/disabled.ks +%ksappend fragments/shared/initial-setup/server/config.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_labwc_43.cfg b/recipes/install_desktop_labwc_43.cfg similarity index 75% rename from recipes/virtual-desktop_labwc_43.cfg rename to recipes/install_desktop_labwc_43.cfg index c8674e9..227bba3 100644 --- a/recipes/virtual-desktop_labwc_43.cfg +++ b/recipes/install_desktop_labwc_43.cfg @@ -5,18 +5,19 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks %ksappend fragments/shared/desktop/labwc/config.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/initial-setup/server/config.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide.cfg b/recipes/install_desktop_rawhide.cfg similarity index 81% rename from recipes/virtual-desktop_rawhide.cfg rename to recipes/install_desktop_rawhide.cfg index 411a7ca..b6c3310 100644 --- a/recipes/virtual-desktop_rawhide.cfg +++ b/recipes/install_desktop_rawhide.cfg @@ -5,19 +5,20 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/shared/core/security/enabled.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks %ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide_encrypted.cfg b/recipes/install_desktop_rawhide_encrypted.cfg similarity index 78% rename from recipes/virtual-desktop_rawhide_encrypted.cfg rename to recipes/install_desktop_rawhide_encrypted.cfg index 76f1232..44fe02e 100644 --- a/recipes/virtual-desktop_rawhide_encrypted.cfg +++ b/recipes/install_desktop_rawhide_encrypted.cfg @@ -5,20 +5,21 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/shared/core/security/enabled.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks %ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/guest-agents/packages.ks -%ksappend fragments/shared/storage/encrypted.ks \ No newline at end of file +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/storage/encrypted.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_amdcpu_rawhide.cfg b/recipes/install_hypervisor_amdcpu_rawhide.cfg similarity index 65% rename from recipes/desktop-hypervisor_amdcpu_rawhide.cfg rename to recipes/install_hypervisor_amdcpu_rawhide.cfg index b906233..345dc23 100644 --- a/recipes/desktop-hypervisor_amdcpu_rawhide.cfg +++ b/recipes/install_hypervisor_amdcpu_rawhide.cfg @@ -5,27 +5,23 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a desktop hypervisor +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/packages/hardware-support.ks -%ksappend fragments/shared/initial-setup/desktop/config.ks -%ksappend fragments/shared/desktop/gnome/config.ks -%ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/desktop/gnome/post-scripts.ks -%ksappend fragments/shared/desktop/vmm/packages.ks -%ksappend fragments/shared/desktop/vmm/post-scripts.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/packages/virtual-machine-manager/packages.ks +%ksappend fragments/shared/packages/virtual-machine-manager/post-scripts.ks +%ksappend fragments/shared/guest-agents/packages.ks %ksappend fragments/shared/core/security/enabled.ks %ksappend fragments/shared/hypervisor/amdcpu.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg b/recipes/install_hypervisor_intelcpu_intelgpu_rawhide.cfg similarity index 66% rename from recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg rename to recipes/install_hypervisor_intelcpu_intelgpu_rawhide.cfg index 863cf23..d33d960 100644 --- a/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg +++ b/recipes/install_hypervisor_intelcpu_intelgpu_rawhide.cfg @@ -5,28 +5,24 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a desktop hypervisor +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/packages/hardware-support.ks -%ksappend fragments/shared/initial-setup/desktop/config.ks -%ksappend fragments/shared/desktop/gnome/config.ks -%ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/desktop/gnome/post-scripts.ks -%ksappend fragments/shared/desktop/vmm/packages.ks -%ksappend fragments/shared/desktop/vmm/post-scripts.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/packages/virtual-machine-manager/packages.ks +%ksappend fragments/shared/packages/virtual-machine-manager/post-scripts.ks +%ksappend fragments/shared/guest-agents/packages.ks %ksappend fragments/shared/core/security/enabled.ks %ksappend fragments/shared/hypervisor/intelcpu.ks %ksappend fragments/shared/hypervisor/intelgpu.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_intelcpu_rawhide.cfg b/recipes/install_hypervisor_intelcpu_rawhide.cfg similarity index 65% rename from recipes/desktop-hypervisor_intelcpu_rawhide.cfg rename to recipes/install_hypervisor_intelcpu_rawhide.cfg index bf2e900..662e419 100644 --- a/recipes/desktop-hypervisor_intelcpu_rawhide.cfg +++ b/recipes/install_hypervisor_intelcpu_rawhide.cfg @@ -5,27 +5,23 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a desktop hypervisor +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/packages/hardware-support.ks -%ksappend fragments/shared/initial-setup/desktop/config.ks -%ksappend fragments/shared/desktop/gnome/config.ks -%ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/desktop/gnome/post-scripts.ks -%ksappend fragments/shared/desktop/vmm/packages.ks -%ksappend fragments/shared/desktop/vmm/post-scripts.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/services.ks %ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/packages/virtual-machine-manager/packages.ks +%ksappend fragments/shared/packages/virtual-machine-manager/post-scripts.ks +%ksappend fragments/shared/guest-agents/packages.ks %ksappend fragments/shared/core/security/enabled.ks %ksappend fragments/shared/hypervisor/intelcpu.ks \ No newline at end of file diff --git a/recipes/virtual-server_43.cfg b/recipes/install_server_43.cfg similarity index 79% rename from recipes/virtual-server_43.cfg rename to recipes/install_server_43.cfg index 9c6bfe5..d065389 100644 --- a/recipes/virtual-server_43.cfg +++ b/recipes/install_server_43.cfg @@ -5,17 +5,16 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual server +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks %ksappend fragments/shared/core/security/enabled.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/initial-setup/server/config.ks \ No newline at end of file diff --git a/recipes/virtual-server_43_devel.cfg b/recipes/install_server_43_devel.cfg similarity index 79% rename from recipes/virtual-server_43_devel.cfg rename to recipes/install_server_43_devel.cfg index 81c610a..d4fb402 100644 --- a/recipes/virtual-server_43_devel.cfg +++ b/recipes/install_server_43_devel.cfg @@ -5,17 +5,16 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual server +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks %ksappend fragments/shared/core/security/disabled.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/initial-setup/server/config.ks \ No newline at end of file diff --git a/recipes/virtual-server_rawhide.cfg b/recipes/install_server_rawhide.cfg similarity index 85% rename from recipes/virtual-server_rawhide.cfg rename to recipes/install_server_rawhide.cfg index bdb9d2b..e1cb336 100644 --- a/recipes/virtual-server_rawhide.cfg +++ b/recipes/install_server_rawhide.cfg @@ -5,18 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual server +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks %ksappend fragments/shared/core/security/enabled.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/virtual-server_rawhide_devel.cfg b/recipes/install_server_rawhide_devel.cfg similarity index 85% rename from recipes/virtual-server_rawhide_devel.cfg rename to recipes/install_server_rawhide_devel.cfg index f0c6074..0a9519f 100644 --- a/recipes/virtual-server_rawhide_devel.cfg +++ b/recipes/install_server_rawhide_devel.cfg @@ -5,18 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual server +# An install recipe for desktop, server, or hypervisor %ksappend fragments/shared/core/base.ks %ksappend fragments/shared/storage/standard.ks -%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/packages/core-group.ks %ksappend fragments/shared/packages/fedora-remix.ks %ksappend fragments/shared/packages/hand-picked.ks -%ksappend fragments/shared/initial-setup/server/config.ks %ksappend fragments/shared/core/security/disabled.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/live-desktop_rawhide.cfg b/recipes/live-desktop_rawhide.cfg deleted file mode 100644 index c95bdda..0000000 --- a/recipes/live-desktop_rawhide.cfg +++ /dev/null @@ -1,24 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live desktop - -%ksappend fragments/shared/live/core/base.ks -%ksappend fragments/shared/live/core/storage.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks -%ksappend fragments/shared/core/locale.ks -%ksappend fragments/shared/core/services.ks -%ksappend fragments/shared/core/network.ks -%ksappend fragments/shared/live/core/packages.ks -%ksappend fragments/shared/live/post/base.ks -%ksappend fragments/shared/live/post/session.ks -%ksappend fragments/shared/initial-setup/desktop/config.ks -%ksappend fragments/shared/desktop/gnome/config.ks -%ksappend fragments/shared/desktop/gnome/packages.ks -%ksappend fragments/shared/desktop/gnome/post-scripts.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/live-server_rawhide.cfg b/recipes/live_desktop_rawhide.cfg similarity index 78% rename from recipes/live-server_rawhide.cfg rename to recipes/live_desktop_rawhide.cfg index a1f2236..87faf67 100644 --- a/recipes/live-server_rawhide.cfg +++ b/recipes/live_desktop_rawhide.cfg @@ -5,17 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a live server +# A live recipe for live-desktop or live-server %ksappend fragments/shared/live/core/base.ks %ksappend fragments/shared/live/core/storage.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/live/core/packages.ks %ksappend fragments/shared/live/post/base.ks %ksappend fragments/shared/live/post/session.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/live-server_rawhide_hypervisor.cfg b/recipes/live_server_rawhide.cfg similarity index 78% rename from recipes/live-server_rawhide_hypervisor.cfg rename to recipes/live_server_rawhide.cfg index a1f2236..1301e5c 100644 --- a/recipes/live-server_rawhide_hypervisor.cfg +++ b/recipes/live_server_rawhide.cfg @@ -5,17 +5,16 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a live server +# A live recipe for live-desktop or live-server %ksappend fragments/shared/live/core/base.ks %ksappend fragments/shared/live/core/storage.ks -%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/bootloader/grub.ks %ksappend fragments/shared/core/locale.ks %ksappend fragments/shared/core/services.ks %ksappend fragments/shared/core/network.ks %ksappend fragments/shared/live/core/packages.ks %ksappend fragments/shared/live/post/base.ks %ksappend fragments/shared/live/post/session.ks -%ksappend fragments/shared/initial-setup/server/config.ks -%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks -%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks \ No newline at end of file