diff --git a/recipes/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu.cfg index 7648b14..f6f13a3 100644 --- a/recipes/desktop-hypervisor-amdcpu.cfg +++ b/recipes/desktop-hypervisor-amdcpu.cfg @@ -8,48 +8,21 @@ # A recipe for an AMD (tm) CPU-based desktop hypervisor %include ../ingredients/core.cfg # Text mode for automated installation -# %include ../ingredients/live-core.cfg # Installation method for live systems - %include ../ingredients/core-storage.cfg # Storage configuration -# %include ../ingredients/live-core-storage.cfg # Basic partition layout for live systems - %include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot - %include ../ingredients/core-locale.cfg # System locale - %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %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-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages -# %include ../ingredients/live-core-mandatory-packages.cfg # Necessary packages for live systems - %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-generic.cfg # Make it a generic distribution %include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support - %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### %include ../ingredients/core-post.cfg # Post configuration script -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system -### End of pre and post section ### - %include ../ingredients/core-desktop-initial-setup.cfg # OEM setup for GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # OEM setup for headless systems - %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 - -%include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs \ No newline at end of file diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg index ff3da2f..0b6adfa 100644 --- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -8,73 +8,23 @@ # A recipe for an Intel(tm) CPU- and Intel(tm) GPUs-based desktop hypervisor # vfio-mdev compatible GPUs required. For Intel, it means 5th to 10th generation only -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents diff --git a/recipes/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu.cfg index 36ac2a5..38014d0 100644 --- a/recipes/desktop-hypervisor-intelcpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu.cfg @@ -7,73 +7,22 @@ # A recipe for an Intel(tm)-based desktop hypervisor -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents diff --git a/recipes/desktop-hypervisor.cfg b/recipes/desktop-hypervisor.cfg index da80b83..29b29c9 100644 --- a/recipes/desktop-hypervisor.cfg +++ b/recipes/desktop-hypervisor.cfg @@ -7,73 +7,21 @@ # A recipe for a desktop hypervisor -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -%include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-hypervisor.cfg # Base hypervisor \ No newline at end of file diff --git a/recipes/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor.cfg index 1f7b7b5..5e64f9c 100644 --- a/recipes/live-desktop-hypervisor.cfg +++ b/recipes/live-desktop-hypervisor.cfg @@ -7,75 +7,24 @@ # A recipe for a live desktop hypervisor -# Installation method. Exactly one option has to be picked -# %include ../ingredients/core.cfg # Text mode %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked -# %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked -# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot %include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %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 -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -%include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-hypervisor.cfg # Base hypervisor \ No newline at end of file diff --git a/recipes/live-server-hypervisor.cfg b/recipes/live-server-hypervisor.cfg index da8f8c7..37d8447 100644 --- a/recipes/live-server-hypervisor.cfg +++ b/recipes/live-server-hypervisor.cfg @@ -78,4 +78,4 @@ # %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs # %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs # %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents +# %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/live-server.cfg b/recipes/live-server.cfg index 463cfbd..d47601a 100644 --- a/recipes/live-server.cfg +++ b/recipes/live-server.cfg @@ -7,75 +7,20 @@ # A recipe for a live server -# Installation method. Exactly one option has to be picked -# %include ../ingredients/core.cfg # Text mode %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked -# %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked -# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot %include ../ingredients/live-core-bootloader-grub.cfg # GNU GRUB for live systems - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %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 -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked -# %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -%include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal -# %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal -# %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -# %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -# %include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/core-server-initial-setup.cfg # For headless systems \ No newline at end of file diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg index add7471..c7b817d 100644 --- a/recipes/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -7,73 +7,21 @@ # A recipe for virtual desktop hypervisor -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) %include ../ingredients/base-guest-agents.cfg # Guest agents diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg index 9727243..56166f3 100644 --- a/recipes/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -7,73 +7,19 @@ # A recipe for a virtual desktop -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell -# %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal -# %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -# %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-nano.cfg b/recipes/virtual-nano.cfg index 30dadb1..62e3422 100644 --- a/recipes/virtual-nano.cfg +++ b/recipes/virtual-nano.cfg @@ -8,73 +8,16 @@ # A recipe for a virtual a very small nano server -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked -# %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked -# %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required -# %include ../ingredients/core-packages-default.cfg # Default but not necessary packages -# %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked -# %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal -# %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal -# %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -# %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server-hypervisor.cfg b/recipes/virtual-server-hypervisor.cfg index fe924d4..32b05e6 100644 --- a/recipes/virtual-server-hypervisor.cfg +++ b/recipes/virtual-server-hypervisor.cfg @@ -7,73 +7,19 @@ # A recipe for a virtual headless hypervisor -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked -# %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal -# %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal -# %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) %include ../ingredients/base-guest-agents.cfg # Guest agents diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg index 7b16ea4..9a33a99 100644 --- a/recipes/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -5,76 +5,20 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ # -# What ? This kickstart defines the ingredients to create a server operating artifact # A recipe for a virtual desktop -# Installation method. Exactly one option has to be picked %include ../ingredients/core.cfg # Text mode -# %include ../ingredients/live-core.cfg # For live systems only - -# Storage configuration. Exactly one option has to be picked %include ../ingredients/core-storage.cfg # ext4-based storage configuration -# %include ../ingredients/live-core-storage.cfg # For live systems only - -# Booloader. Exactly one option has to be picked %include ../ingredients/core-bootloader-grub.cfg # GNU GRUB -# %include ../ingredients/core-bootloader-systemd-boot.cfg # systemd-boot - -# System locale. Exactly one option has to be picked %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language - -# Security mode. Exactly one option has to be picked %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux -# %include ../ingredients/core-security-on.cfg # Lock root account, enable firewall and SELinux - -# System services and networking. The two choices are required %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration - -### Package selection ### -# Mandatory packages. Exactly one option has to be picked %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages -# %include ../ingredients/core-packages-mandatory-trimming-attempt.cfg # Trimming attempt for the mandatory packages - -# Mandatory packages to make it a generic distribution. Required %include ../ingredients/core-packages-generic.cfg # Generic - -# Mandatory packages for live edition. Required -# %include ../ingredients/live-core-mandatory-packages.cfg # For live systems - -# Other optional packages. Recommended but not stricly required %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-packages-custom.cfg # Hand-picked packages -# %include ../ingredients/core-packages-hardware-support.cfg # Extended hardware support -### End of Package selection ### - -# Repositories. Exactly one option has to be picked %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -# %include ../ingredients/core-fedora-repo-rawhide.cfg # Offical repositories for Fedora Rawhide - -### Pre and post section ### -# Scripts launched before the installation. Optionnal. Two options can be picked -# %include ../ingredients/pre.cfg # Triggered just after the kickstart file has been parsed -# %include ../ingredients/pre-install.cfg # Script triggered just after the system storage has been set up -# Scripts launched after the installation. Optionnal. -# %include ../ingredients/phyllomeos/ingredients/core-post-nochroot.cfg # Triggered after the installation no chroot %include ../ingredients/core-post.cfg # Triggered after the installation -#%include ../ingredients/live-core-post.cfg # Post configuration script for a live system only -### End of pre and post section ### - -# OEM setup. Exactly one option has to be picked -# %include ../ingredients/core-desktop-initial-setup.cfg # For GNOME Shell %include ../ingredients/core-server-initial-setup.cfg # For headless systems - -# A GNOME Shell-based desktop environment. Optionnal -# %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment - -# Virtualization-related packages. Optionnal -# %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager -# %include ../ingredients/base-hypervisor.cfg # Base hypervisor - -# Virtualization-related options. Optionnal -# %include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs -# %include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs -# %include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) -%include ../ingredients/base-guest-agents.cfg # Guest agents +%include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file