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

fragments/platform/generic-43/bootloader/grub.ks

@@ -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

fragments/platform/generic-43/bootloader/systemd-boot.ks

@@ -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

fragments/platform/generic-rawhide/bootloader/grub.ks

@@ -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

fragments/platform/generic-rawhide/bootloader/systemd-boot.ks

@@ -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

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

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
+# Start libvirt service
-cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF
+systemctl enable libvirtd
-[Desktop Entry]
+systemctl start libvirtd
-Type=Application
-Name=Virtual Machine Manager
-Exec=virt-manager
-EOF
 
-# Modify the default virt-manager behavior for misc. options
+%end
-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

fragments/shared/initial-setup/desktop/config.ks

@@ -1,25 +1 @@
-# Initial setup - GNOME desktop mode
+# Desktop initial-setup configuration
-
-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

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
+initial-setup # Initial setup package
-# 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

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

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

fragments/shared/live/hypervisor.ks

@@ -1,10 +1,14 @@
-# Hypervisor package inclusion for live server
+# Live desktop hypervisor configuration
-
-%packages --exclude-weakdeps
 
+# 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

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

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

fragments/shared/section-data/post/server.ks

@@ -0,0 +1 @@
+# Server-specific post-install tasks

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/

recipe-generator/generate_recipe.py

@@ -136,17 +136,32 @@ class RecipeGenerator:
         for opt_key, opt_config in template.get('optional', {}).items():
             if isinstance(opt_config, dict):
                 for value, fragment_path in opt_config.items():
-                    if fragment_path.startswith('fragments/'):
+                    # Skip None values
-                        full_path = self.project_root / fragment_path
+                    if fragment_path is None:
-                    elif fragment_path is None:
                         continue
+                    # Handle lists
+                    if isinstance(fragment_path, list):
+                        for fp in fragment_path:
+                            if fp is None:
+                                continue
+                            if fp.startswith('fragments/'):
+                                full_path = self.project_root / fp
+                            else:
+                                full_path = self.ingredients_dir / f"{fp}.cfg"
+                            if not full_path.exists():
+                                errors.append(f"Optional fragment not found: {fp} (in list for {opt_key}={value})")
                     else:
-                        full_path = self.ingredients_dir / f"{fragment_path}.cfg"
+                        if fragment_path.startswith('fragments/'):
+                            full_path = self.project_root / fragment_path
+                        else:
+                            full_path = self.ingredients_dir / f"{fragment_path}.cfg"
                         
-                    if not full_path.exists():
+                        if not full_path.exists():
-                        errors.append(f"Optional fragment not found: {fragment_path} (for {opt_key}={value})")
+                            errors.append(f"Optional fragment not found: {fragment_path} (for {opt_key}={value})")
             elif isinstance(opt_config, list):
                 for fragment_path in opt_config:
+                    if fragment_path is None:
+                        continue
                     if fragment_path.startswith('fragments/'):
                         full_path = self.project_root / fragment_path
                     else:
@@ -156,7 +171,6 @@ class RecipeGenerator:
                         errors.append(f"Optional fragment not found: {fragment_path} (in list)")
 
         return errors
-
     def validate_manifest(self, manifest: Dict) -> 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):
-                            includes.append(f"%ksappend {fragment_path}")
+                            for fp in fragment_path:
-                            seen.add(fragment_path)
+                                if fp is not None and fp not in seen:
-                elif isinstance(opt_config, list) and value is True:
+                                    includes.append(f"%ksappend {fp}")
-                    for fragment_path in opt_config:
+                                    seen.add(fp)
-                        if fragment_path not in seen:
+                        elif fragment_path and fragment_path not in seen:
                             includes.append(f"%ksappend {fragment_path}")
                             seen.add(fragment_path)
                 
-        # Handle special modifiers (CPU, GPU)
+                # 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 is not None and fragment_path not in seen:
+                            includes.append(f"%ksappend {fragment_path}")
+                            seen.add(fragment_path)
+        
+        # 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]
+                # Handle nested dict modifiers
-                    if fragment_path and fragment_path not in seen:
+                if isinstance(mod_config, dict) and isinstance(mod_value, str):
-                        includes.append(f"%ksappend {fragment_path}")
+                    if mod_value in mod_config:
-                        seen.add(fragment_path)
+                        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)
+        # Add variant subname for install variants (desktop, server, hypervisor)
-        if modifiers.get('cpu') and modifiers.get('cpu') != 'generic':
+        if variant_subname and variant_subname in ['desktop', 'server', 'hypervisor']:
-            parts.append(modifiers['cpu'])
+            parts.append(variant_subname)
-        if modifiers.get('gpu') and modifiers.get('gpu') != 'none':
+        
-            parts.append(modifiers['gpu'])
+        # 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,

recipe-generator/recipe_templates.yaml

@@ -4,183 +4,94 @@
 # Fragment paths use relative paths from project root
 
 templates:
-  # Virtual desktop recipe
+  # Install recipe - for desktop, server, or hypervisor
-  # Modifiers: desktop (gnome|labwc), storage (standard|encrypted), 
+  install:
-  #            security (secure|devel), version (43|rawhide), post (true|false)
+    description: "An install recipe for desktop, server, or hypervisor"
-  virtual-desktop:
-    description: "A recipe for a virtual desktop"
     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:
+      hardware-support: fragments/shared/packages/hardware-support.ks
-        secure: fragments/shared/core/security/enabled.ks
+      variant_type:
-        devel: fragments/shared/core/security/disabled.ks
+        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
+        gnome:
-        labwc: fragments/shared/desktop/labwc/config.ks
+          - fragments/shared/desktop/gnome/config.ks
-      post: fragments/shared/section-data/post/base.ks
+          - fragments/shared/desktop/gnome/packages.ks
-      extras:
+          - fragments/shared/desktop/gnome/post-scripts.ks
-        - fragments/shared/guest-agents/packages.ks
+        labwc:
-    modifiers:
+          - fragments/shared/desktop/labwc/config.ks
-      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:
       security:
         secure: fragments/shared/core/security/enabled.ks
         devel: fragments/shared/core/security/disabled.ks
-      version:
+      initial-setup:
-        "43": fragments/platform/generic-43/repo/fedora-mirrors.ks
+        server: fragments/shared/initial-setup/server/config.ks
-        "rawhide": fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks
+        desktop: fragments/shared/initial-setup/desktop/config.ks
-      post: fragments/shared/section-data/post/base.ks
+      hypervisor-type:
-      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
         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
+  # Live recipe - for live-desktop or live-server
-  # Modifiers: desktop (gnome|none), security (secure|devel), version (rawhide)
+  live:
-  live-desktop:
+    description: "A live recipe for live-desktop or live-server"
-    description: "A recipe for a live desktop"
     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
+      hardware-support: 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
       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

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
+  # Install variants - desktop
-  - name: virtual-desktop
+  - name: install
     variants:
-      - version: 43
+      - name: desktop
+        version: 43
         desktop: gnome
         storage: standard
+        bootloader: grub
         security: secure
-        extras: true
+        hardware-support: true
-      - version: 43
+        initial-setup: server
+      - name: desktop
+        version: 43
         desktop: gnome
         storage: standard
+        bootloader: grub
         security: devel
-        extras: true
+        hardware-support: true
-      - version: 43
+        initial-setup: server
+      - name: desktop
+        version: 43
         desktop: labwc
         storage: standard
+        bootloader: grub
         security: secure
-        extras: true
+        hardware-support: true
-      - version: rawhide
+        initial-setup: server
+      - name: desktop
+        version: rawhide
         desktop: gnome
         storage: standard
+        bootloader: grub
         security: secure
-        extras: true
+        hardware-support: true
-      - version: rawhide
+        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
+  # Install variants - server (minimal, no desktop packages)
-  - name: virtual-server
+  - name: install
     variants:
-      - version: 43
+      - name: server
+        version: 43
+        storage: standard
+        bootloader: grub
         security: secure
-        extras: true
+        hardware-support: true
-        post: true
+        initial-setup: server
-      - version: 43
+      - name: server
+        version: 43
+        storage: standard
+        bootloader: grub
         security: devel
-        extras: true
+        hardware-support: true
-        post: false
+        initial-setup: server
-      - version: rawhide
+      - name: server
+        version: rawhide
+        storage: standard
+        bootloader: grub
         security: secure
-        extras: true
+        hardware-support: true
-        post: true
+        initial-setup: server
-      - version: rawhide
+      - name: server
+        version: rawhide
+        storage: standard
+        bootloader: grub
         security: devel
-        extras: true
+        hardware-support: true
-        post: false
+        initial-setup: server
 
-  # Desktop Hypervisor variants
+  # Install variants - hypervisor
-  - name: desktop-hypervisor
+  - name: install
     variants:
-      - version: rawhide
+      - name: hypervisor
+        version: rawhide
+        storage: standard
+        bootloader: grub
         security: secure
-      - version: rawhide
+        hardware-support: true
-        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
         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

recipes/desktop-hypervisor_rawhide.cfg

@@ -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

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
+%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

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
+%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

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/desktop/gnome/packages.ks
-%ksappend fragments/shared/core/security/enabled.ks
+%ksappend fragments/shared/desktop/gnome/post-scripts.ks
 %ksappend fragments/shared/desktop/labwc/config.ks
-%ksappend fragments/shared/guest-agents/packages.ks
+%ksappend fragments/shared/core/security/enabled.ks
+%ksappend fragments/shared/initial-setup/server/config.ks

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
+%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

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/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

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

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

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

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
+%ksappend fragments/shared/initial-setup/server/config.ks

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
+%ksappend fragments/shared/initial-setup/server/config.ks

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/shared/initial-setup/server/config.ks
 %ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks
-%ksappend fragments/shared/guest-agents/packages.ks

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/shared/initial-setup/server/config.ks
 %ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks
-%ksappend fragments/shared/guest-agents/packages.ks

recipes/live-desktop_rawhide.cfg

@@ -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

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/shared/desktop/gnome/packages.ks
-%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks
 %ksappend fragments/shared/core/security/enabled.ks
+%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks

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
+%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks