Refactor recipes with newer ingredients

dishes/desktop-hypervisor-amdcpu.cfg

@@ -248,6 +248,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -275,6 +276,7 @@ iwlegacy-firmware
 iwlwifi-dvm-firmware
 iwlwifi-mvm-firmware
 kbd
+kernel
 less
 libertas-firmware
 libguestfs-tools

dishes/desktop-hypervisor-intelcpu-intelgpu.cfg

@@ -258,6 +258,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -285,6 +286,7 @@ iwlegacy-firmware
 iwlwifi-dvm-firmware
 iwlwifi-mvm-firmware
 kbd
+kernel
 less
 libertas-firmware
 libguestfs-tools

dishes/desktop-hypervisor-intelcpu.cfg

@@ -248,6 +248,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -275,6 +276,7 @@ iwlegacy-firmware
 iwlwifi-dvm-firmware
 iwlwifi-mvm-firmware
 kbd
+kernel
 less
 libertas-firmware
 libguestfs-tools

dishes/desktop-hypervisor.cfg

@@ -240,6 +240,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -267,6 +268,7 @@ iwlegacy-firmware
 iwlwifi-dvm-firmware
 iwlwifi-mvm-firmware
 kbd
+kernel
 less
 libertas-firmware
 libguestfs-tools

dishes/virtual-desktop-hypervisor.cfg

@@ -233,6 +233,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -254,6 +255,7 @@ hostname
 iproute
 iputils
 kbd
+kernel
 less
 libguestfs-tools
 libusb1

dishes/virtual-desktop.cfg

@@ -140,6 +140,7 @@ dejavu-sans-mono-fonts
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -160,6 +161,7 @@ hostname
 iproute
 iputils
 kbd
+kernel
 less
 libusb1
 man-db

dishes/virtual-nano.cfg

@@ -27,7 +27,7 @@ timezone Europe/Paris --utc
 # Use network installation
 url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
 # System bootloader configuration
-bootloader --location=mbr --timeout=1
+bootloader --location=mbr --timeout=1 --sdboot
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
@@ -46,14 +46,10 @@ grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful
 %end
 
 %packages --exclude-weakdeps
-audit
 basesystem
 bash
-coreutils
-curl
 dhcp-client
 dnf5
-e2fsprogs
 fedora-remix-logos
 filesystem
 generic-logos
@@ -65,32 +61,36 @@ hostname
 initial-setup
 iproute
 iputils
-kbd
-less
-man-db
 ncurses
-openssh-clients
-openssh-server
-parted
-policycoreutils
-procps-ng
 qemu-guest-agent
 rootfiles
 rpm
-selinux-policy-targeted
 setup
 shadow-utils
 spice-vdagent
-sssd-common
-sssd-kcm
-sudo
 systemd
-util-linux
+-audit
-vim-minimal
+-coreutils
+-curl
+-e2fsprogs
 -fedora-logos
 -fedora-release
 -fedora-release-common
 -fedora-release-identity-basic
 -fedora-release-notes
+-kbd
+-less
+-man-db
+-openssh-clients
+-openssh-server
+-parted
+-policycoreutils
+-procps-ng
+-selinux-policy-targeted
+-sssd-common
+-sssd-kcm
+-sudo
+-util-linux
+-vim-minimal
 
 %end

dishes/virtual-server.cfg

@@ -55,6 +55,7 @@ curl
 dhcp-client
 dnf5
 dnf5-plugins
+dracut
 dracut-config-rescue
 e2fsprogs
 fedora-remix-logos
@@ -71,6 +72,7 @@ initial-setup
 iproute
 iputils
 kbd
+kernel
 less
 libusb1
 man-db

ingredients/core-bootloader-grub.cfg

@@ -0,0 +1,10 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+
+# What ? This kickstart ingredient provides GNU GRUB
+
+bootloader --timeout=1 # Set the GNU GRUB bootloader timeout to 1

ingredients/core-bootloader-systemd-boot.cfg

@@ -0,0 +1,10 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+
+# What ? This kickstart ingredient provides systemd-boot, as an alternative to GNU GRUB 
+
+bootloader --sdboot --timeout=1 # Use systemd-boot and set a timeout to 1

ingredients/core-fedora-repo-rawhide.cfg

@@ -7,6 +7,5 @@
 
 # What ? This kickstart file provides a the Fedora Rawhide official repositories
 
-# Official Fedora rawhide repositories	
 repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

ingredients/core-fedora-repo.cfg

@@ -5,9 +5,8 @@
 #  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
 # /_/          /____/
 
-# What ? This kickstart file provides a the Fedora official repositories for free software
+# What ? This kickstart file provides a the Fedora official repositories
 
-# Official Fedora repositories
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror
 url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror

ingredients/core-network.cfg

@@ -0,0 +1,11 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+#
+# What ? This kickstart file provides the basic block to build a minimal operating system based on Fedora
+
+network  --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network interfaces and set hostname. "link" selects the first device reaching an up state
+

ingredients/core-packages-mandatory.cfg

@@ -16,6 +16,7 @@ coreutils # A set of basic GNU tools commonly used in shell scripts
 curl # A utility for getting files from remote servers (FTP, HTTP, and others)
 dhcp-client # Provides the ISC DHCP client daemon and dhclient-script
 dnf5 # Command-line package manager
+dracut # Initramfs generator using udev
 e2fsprogs # Utilities for managing ext2, ext3, and ext4 file systems
 filesystem # The basic directory layout for a Linux system
 glibc # The GNU libc libraries
@@ -23,6 +24,7 @@ hostname # Utility to set/show the host name or domain name
 iproute # Advanced IP routing and network device configuration tools
 iputils # Network monitoring tools including ping
 kbd # Tools for configuring the console (keyboard, virtual terminals, etc.)
+kernel # The Linux kernel
 less # A text file browser similar to more, but better. Can be excluded
 man-db # Tools for searching and reading man pages. Can be excluded
 ncurses # Ncurses support utilities

ingredients/core-security-off.cfg

@@ -0,0 +1,12 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+#
+# What ? This kickstart ingredient sets security to low
+
+rootpw --lock --iscrypted locked # The root account is locked by default. The root user will not be able to log in from the console
+selinux --disabled # Make sure SELinux is disabled ; other option: --enforcing
+firewall --disabled # Make sure the firewall is disabled

ingredients/core-security-on.cfg

@@ -0,0 +1,12 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+#
+# What ? This kickstart ingredient sets security to normal
+
+rootpw --lock --iscrypted locked # The root account is locked by default. The root user will not be able to log in from the console
+selinux --enabled # Make sure SELinux is enabled ; other option: --disabled
+firewall --enabled # Make sure the firewall is enabled

ingredients/core-services.cfg

@@ -0,0 +1,10 @@
+#            __          ____                        ____  _____
+#     ____  / /_  __  __/ / /___  ____ ___  ___     / __ \/ ___/
+#    / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \   / / / /\__ \
+#   / /_/ / / / / /_/ / / / /_/ / / / / / /  __/  / /_/ /___/ /
+#  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
+# /_/          /____/
+#
+# What ? This kickstart file provides the basic block to build a minimal operating system based on Fedora
+
+services --enabled=NetworkManager,chronyd,systemd-resolved

ingredients/core-storage.cfg

@@ -9,7 +9,6 @@
 
 zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record
 clearpart --all --initlabel # Partition clearing information. This setup uses GPT by default.
-bootloader --timeout=1 # Set the GNU GRUB bootloader timeout to 1
 
 part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt" --label=efi # Will create an EFI system partitition of 128 MiB (vda1)
 part /boot --fstype="ext4" --size=512 --label=boot # Create a boot partition of 512 MiB using the ext4 filesystem (vda2)

ingredients/core.cfg

@@ -5,15 +5,8 @@
 #  / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/   \____//____/
 # /_/          /____/
 #
-# What ? This kickstart file provides the basic block to build a minimal operating system based on Fedora
+# What ? This kickstart ingredients define the installation method
 
 text # Perform the kickstart installation in text mode
 
-rootpw --lock --iscrypted locked # Lock the root account
-selinux --disabled # Make sure SELinux is disabled ; other option: --enforcing
-firewall --disable # Make sure the firewall is disabled
-
-services --enabled=NetworkManager,chronyd,systemd-resolved
-network  --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network interfaces and set hostname. "link" selects the first device reaching an up state
-
 poweroff # Shut down the system after a successful installation

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

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

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

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

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 

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-storage.cfg # Storage configuration
-%include ../ingredients/core-locale.cfg # A system locale
+%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

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-storage.cfg # Storage configuration
-%include ../ingredients/core-locale.cfg # A system locale
+%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
 

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-storage.cfg # Storage configuration
-%include ../ingredients/core-locale.cfg # A system locale
+%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