From d8a679dde9e47a0fae46f854d5d494131014cb5a Mon Sep 17 00:00:00 2001 From: luz Date: Tue, 29 Apr 2025 19:17:29 -0500 Subject: [PATCH] Refactor recipes with newer ingredients --- recipes/desktop-hypervisor-amdcpu.cfg | 7 ++++++- recipes/desktop-hypervisor-intelcpu-intelgpu.cfg | 7 ++++++- recipes/desktop-hypervisor-intelcpu.cfg | 7 ++++++- recipes/desktop-hypervisor.cfg | 7 ++++++- recipes/virtual-desktop-hypervisor.cfg | 7 ++++++- recipes/virtual-desktop.cfg | 9 +++++++-- recipes/virtual-nano.cfg | 11 ++++++++--- recipes/virtual-server.cfg | 11 ++++++++--- 8 files changed, 53 insertions(+), 13 deletions(-) diff --git a/recipes/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu.cfg index 3a36249..3268293 100644 --- a/recipes/desktop-hypervisor-amdcpu.cfg +++ b/recipes/desktop-hypervisor-amdcpu.cfg @@ -8,9 +8,14 @@ # What ? This kickstart file bootstraps a desktop hypervisor configured for AMD (tm) CPUs. %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB %include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg index 7bc9c08..dc3b59c 100644 --- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -8,9 +8,14 @@ # What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) GPUs compatible with vfio-mdev (pre-Tiger Lake) %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB %include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution diff --git a/recipes/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu.cfg index 8e0dffb..493182d 100644 --- a/recipes/desktop-hypervisor-intelcpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu.cfg @@ -8,9 +8,14 @@ # What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPUs %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB %include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution diff --git a/recipes/desktop-hypervisor.cfg b/recipes/desktop-hypervisor.cfg index 43cf20c..336dc88 100644 --- a/recipes/desktop-hypervisor.cfg +++ b/recipes/desktop-hypervisor.cfg @@ -8,9 +8,14 @@ # What ? This kickstart file bootstraps a desktop hypervisor. %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB %include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg index a74f442..d09ad12 100644 --- a/recipes/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -8,9 +8,14 @@ # What ? This kickstart file bootstraps a desktop hypervisor meant to be installed inside a virtual machine. %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB %include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg index 5df015f..0f228c4 100644 --- a/recipes/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -8,8 +8,13 @@ # What ? This kickstart file bootstraps a desktop machine using GNOME Shell meant to be used as a virtual machine. %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB +%include ../ingredients/core-locale.cfg # System locale + +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages diff --git a/recipes/virtual-nano.cfg b/recipes/virtual-nano.cfg index 897b3cd..5c45f7c 100644 --- a/recipes/virtual-nano.cfg +++ b/recipes/virtual-nano.cfg @@ -8,10 +8,15 @@ # What ? This kickstart file bootstraps a server-oriented system. %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot +%include ../ingredients/core-locale.cfg # System locale -%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration + +%include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg index 9ae6cad..749a56a 100644 --- a/recipes/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -5,11 +5,16 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ # -# What ? This kickstart file bootstraps a server-oriented system. +# What ? This kickstart defines the ingredients to create a server operating artifact %include ../ingredients/core.cfg # The core configuration -%include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale +%include ../ingredients/core-storage.cfg # Storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB +%include ../ingredients/core-locale.cfg # System locale + +%include ../ingredients/core-security-off.cfg # Set security to low +%include ../ingredients/core-services.cfg # Systemd services +%include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages