diff --git a/recipes/live-desktop.cfg b/recipes/live-desktop.cfg index 09c1503..28b48c5 100644 --- a/recipes/live-desktop.cfg +++ b/recipes/live-desktop.cfg @@ -7,75 +7,22 @@ # A recipe for a live 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 %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-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.cfg index 37d8447..2fc2d09 100644 --- a/recipes/live-server-hypervisor.cfg +++ b/recipes/live-server-hypervisor.cfg @@ -7,75 +7,22 @@ # A recipe for a live server 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 \ No newline at end of file +%include ../ingredients/base-hypervisor.cfg # Base hyperviso \ No newline at end of file diff --git a/recipes/virtual-nano.cfg b/recipes/virtual-nano.cfg index 62e3422..1f3cf14 100644 --- a/recipes/virtual-nano.cfg +++ b/recipes/virtual-nano.cfg @@ -4,7 +4,6 @@ # / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# # A recipe for a virtual a very small nano server diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg index 9a33a99..cbc5fc7 100644 --- a/recipes/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -4,7 +4,7 @@ # / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# + # A recipe for a virtual desktop %include ../ingredients/core.cfg # Text mode