From 714d27b6dc2911dd8b41942d4e5fe2030d44c213 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Sun, 15 Feb 2026 19:31:16 +0100 Subject: [PATCH] Merge mandatory and default packages ingredients into core-packages Rename initial setup desktop to gnome initial setup desktop --- ... => desktop-hypervisor-amdcpu_rawhide.cfg} | 5 ++--- ...-hypervisor-intelcpu-intelgpu_rawhide.cfg} | 7 +++--- ...> desktop-hypervisor-intelcpu_rawhide.cfg} | 5 ++--- ...sor.cfg => desktop-hypervisor_rawhide.cfg} | 5 ++--- recipes/{desktop.cfg => desktop_rawhide.cfg} | 5 ++--- ...fg => live-desktop-hypervisor_rawhide.cfg} | 6 ++--- ...e-desktop.cfg => live-desktop_rawhide.cfg} | 5 ++--- ...cfg => live-server-hypervisor_rawhide.cfg} | 3 +-- ...ive-server.cfg => live-server_rawhide.cfg} | 3 +-- recipes/virtual-desktop_43.cfg | 6 ++--- recipes/virtual-desktop_43_devel.cfg | 4 ++-- recipes/virtual-desktop_devel_rawhide.cfg | 5 ++--- recipes/virtual-desktop_labwc_43.cfg | 22 +++++++++++++++++++ recipes/virtual-desktop_rawhide.cfg | 7 +++--- recipes/virtual-server_43.cfg | 6 ++--- recipes/virtual-server_devel_43.cfg | 3 +-- recipes/virtual-server_devel_rawhide.cfg | 3 +-- recipes/virtual-server_rawhide.cfg | 6 ++--- 18 files changed, 54 insertions(+), 52 deletions(-) rename recipes/{desktop-hypervisor-amdcpu.cfg => desktop-hypervisor-amdcpu_rawhide.cfg} (83%) rename recipes/{desktop-hypervisor-intelcpu-intelgpu.cfg => desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg} (83%) rename recipes/{desktop-hypervisor-intelcpu.cfg => desktop-hypervisor-intelcpu_rawhide.cfg} (86%) rename recipes/{desktop-hypervisor.cfg => desktop-hypervisor_rawhide.cfg} (81%) rename recipes/{desktop.cfg => desktop_rawhide.cfg} (82%) rename recipes/{live-desktop-hypervisor.cfg => live-desktop-hypervisor_rawhide.cfg} (80%) rename recipes/{live-desktop.cfg => live-desktop_rawhide.cfg} (84%) rename recipes/{live-server-hypervisor.cfg => live-server-hypervisor_rawhide.cfg} (87%) rename recipes/{live-server.cfg => live-server_rawhide.cfg} (89%) create mode 100644 recipes/virtual-desktop_labwc_43.cfg diff --git a/recipes/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu_rawhide.cfg similarity index 83% rename from recipes/desktop-hypervisor-amdcpu.cfg rename to recipes/desktop-hypervisor-amdcpu_rawhide.cfg index e4886c0..643c218 100644 --- a/recipes/desktop-hypervisor-amdcpu.cfg +++ b/recipes/desktop-hypervisor-amdcpu_rawhide.cfg @@ -14,12 +14,11 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Post configuration script -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg similarity index 83% rename from recipes/desktop-hypervisor-intelcpu-intelgpu.cfg rename to recipes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg index b41e844..89bc809 100644 --- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg @@ -15,13 +15,12 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell -%include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs diff --git a/recipes/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu_rawhide.cfg similarity index 86% rename from recipes/desktop-hypervisor-intelcpu.cfg rename to recipes/desktop-hypervisor-intelcpu_rawhide.cfg index 111097e..3b83d13 100644 --- a/recipes/desktop-hypervisor-intelcpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu_rawhide.cfg @@ -14,12 +14,11 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor diff --git a/recipes/desktop-hypervisor.cfg b/recipes/desktop-hypervisor_rawhide.cfg similarity index 81% rename from recipes/desktop-hypervisor.cfg rename to recipes/desktop-hypervisor_rawhide.cfg index c073c62..2ec596a 100644 --- a/recipes/desktop-hypervisor.cfg +++ b/recipes/desktop-hypervisor_rawhide.cfg @@ -14,12 +14,11 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor \ No newline at end of file diff --git a/recipes/desktop.cfg b/recipes/desktop_rawhide.cfg similarity index 82% rename from recipes/desktop.cfg rename to recipes/desktop_rawhide.cfg index 9a3af33..f37b0a2 100644 --- a/recipes/desktop.cfg +++ b/recipes/desktop_rawhide.cfg @@ -14,10 +14,9 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment \ No newline at end of file diff --git a/recipes/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor_rawhide.cfg similarity index 80% rename from recipes/live-desktop-hypervisor.cfg rename to recipes/live-desktop-hypervisor_rawhide.cfg index 30e19be..33fcee8 100644 --- a/recipes/live-desktop-hypervisor.cfg +++ b/recipes/live-desktop-hypervisor_rawhide.cfg @@ -14,15 +14,13 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration -%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -%include ../ingredients/live-core-mandatory-packages.cfg # For live systems -%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only %include ../ingredients/live-core-post-live-session.cfg # Live session script -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor \ No newline at end of file diff --git a/recipes/live-desktop.cfg b/recipes/live-desktop_rawhide.cfg similarity index 84% rename from recipes/live-desktop.cfg rename to recipes/live-desktop_rawhide.cfg index dfac4d6..05736f6 100644 --- a/recipes/live-desktop.cfg +++ b/recipes/live-desktop_rawhide.cfg @@ -14,13 +14,12 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration -%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/live-core-mandatory-packages.cfg # For live systems -%include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only %include ../ingredients/live-core-post-live-session.cfg # Live session script -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment \ No newline at end of file diff --git a/recipes/live-server-hypervisor.cfg b/recipes/live-server-hypervisor_rawhide.cfg similarity index 87% rename from recipes/live-server-hypervisor.cfg rename to recipes/live-server-hypervisor_rawhide.cfg index d2d8596..9020f49 100644 --- a/recipes/live-server-hypervisor.cfg +++ b/recipes/live-server-hypervisor_rawhide.cfg @@ -14,9 +14,8 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration -%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/live-core-mandatory-packages.cfg # For live systems -%include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation diff --git a/recipes/live-server.cfg b/recipes/live-server_rawhide.cfg similarity index 89% rename from recipes/live-server.cfg rename to recipes/live-server_rawhide.cfg index 8cf3d50..b0cfda3 100644 --- a/recipes/live-server.cfg +++ b/recipes/live-server_rawhide.cfg @@ -14,9 +14,8 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration -%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/live-core-mandatory-packages.cfg # For live systems -%include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation %include ../ingredients/live-core-post.cfg # Post configuration script for a live system only diff --git a/recipes/virtual-desktop_43.cfg b/recipes/virtual-desktop_43.cfg index ac0baaf..bd684d2 100644 --- a/recipes/virtual-desktop_43.cfg +++ b/recipes/virtual-desktop_43.cfg @@ -14,11 +14,9 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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-hardware-support.cfg # Extended hardware support +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-43.cfg # Official repositories for Fedora 43 %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-desktop_43_devel.cfg b/recipes/virtual-desktop_43_devel.cfg index 2cbb27d..b51cebc 100644 --- a/recipes/virtual-desktop_43_devel.cfg +++ b/recipes/virtual-desktop_43_devel.cfg @@ -14,8 +14,8 @@ %include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-43.cfg # Official repositories for Fedora 43 %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-desktop_devel_rawhide.cfg b/recipes/virtual-desktop_devel_rawhide.cfg index 47d944e..2c7f49c 100644 --- a/recipes/virtual-desktop_devel_rawhide.cfg +++ b/recipes/virtual-desktop_devel_rawhide.cfg @@ -14,9 +14,8 @@ %include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-desktop_labwc_43.cfg b/recipes/virtual-desktop_labwc_43.cfg new file mode 100644 index 0000000..5c69843 --- /dev/null +++ b/recipes/virtual-desktop_labwc_43.cfg @@ -0,0 +1,22 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# A recipe for a virtual desktop + +%include ../ingredients/core.cfg # Text mode +%include ../ingredients/core-storage.cfg # ext4-based storage configuration +%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB +%include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language +%include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux +%include ../ingredients/core-services.cfg # Required systemd services +%include ../ingredients/core-network.cfg # Network configuration +%include ../ingredients/core-packages.cfg # Mandatory packages +%include ../ingredients/core-fedora-repo-43.cfg # Official repositories for Fedora 43 +%include ../ingredients/core-post.cfg # Triggered after the installation +%include ../ingredients/core-initial-setup-generic-wayland-desktop.cfg # Enable initial setup to allow end users to create user on first boot +%include ../ingredients/base-desktop-labwc.cfg # A labwc shell-based desktop environment +%include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide.cfg b/recipes/virtual-desktop_rawhide.cfg index 705dc37..05e9792 100644 --- a/recipes/virtual-desktop_rawhide.cfg +++ b/recipes/virtual-desktop_rawhide.cfg @@ -14,11 +14,10 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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-hardware-support.cfg # Extended hardware support +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment +%include ../ingredients/core-initial-setup-gnome-desktop.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server_43.cfg b/recipes/virtual-server_43.cfg index 23c227c..b3a2e09 100644 --- a/recipes/virtual-server_43.cfg +++ b/recipes/virtual-server_43.cfg @@ -14,10 +14,8 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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-hardware-support.cfg # Extended hardware support +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-43.cfg # Official repositories for Fedora 43 %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-server.cfg # OEM setup +%include ../ingredients/core-initial-setup-server.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server_devel_43.cfg b/recipes/virtual-server_devel_43.cfg index 36a23f5..4867b89 100644 --- a/recipes/virtual-server_devel_43.cfg +++ b/recipes/virtual-server_devel_43.cfg @@ -14,7 +14,6 @@ %include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-43.cfg # Official repositories for Fedora 43 %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server_devel_rawhide.cfg b/recipes/virtual-server_devel_rawhide.cfg index 8d54ed8..696fd23 100644 --- a/recipes/virtual-server_devel_rawhide.cfg +++ b/recipes/virtual-server_devel_rawhide.cfg @@ -14,7 +14,6 @@ %include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server_rawhide.cfg b/recipes/virtual-server_rawhide.cfg index bcb4b15..67e1e97 100644 --- a/recipes/virtual-server_rawhide.cfg +++ b/recipes/virtual-server_rawhide.cfg @@ -14,10 +14,8 @@ %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux %include ../ingredients/core-services.cfg # Required 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-hardware-support.cfg # Extended hardware support +%include ../ingredients/core-packages.cfg # Mandatory packages %include ../ingredients/core-fedora-repo-rawhide.cfg # Official repositories for Fedora Rawhide %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-server.cfg # OEM setup +%include ../ingredients/core-initial-setup-server.cfg # Enable initial setup to allow end users to create user on first boot %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file