From f3031fdf0fed2b9e437fcb3460212a8ee8540738 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Tue, 24 Mar 2026 21:27:47 +0100 Subject: [PATCH] fix: update integration tests for new recipe paths --- .gitignore | 3 - external/kickstart-tests | 1 - external/pykickstart | 1 - recipes/desktop-hypervisor_amdcpu_rawhide.cfg | 36 +- ...p-hypervisor_intelcpu_intelgpu_rawhide.cfg | 38 +- .../desktop-hypervisor_intelcpu_rawhide.cfg | 36 +- recipes/desktop-hypervisor_rawhide.cfg | 34 +- recipes/live-desktop_rawhide.cfg | 29 +- recipes/live-server_rawhide.cfg | 25 +- recipes/live-server_rawhide_hypervisor.cfg | 25 +- recipes/virtual-desktop_43.cfg | 24 +- recipes/virtual-desktop_43_devel.cfg | 24 +- recipes/virtual-desktop_labwc_43.cfg | 24 +- recipes/virtual-desktop_rawhide.cfg | 26 +- recipes/virtual-desktop_rawhide_encrypted.cfg | 28 +- recipes/virtual-server_43.cfg | 22 +- recipes/virtual-server_43_devel.cfg | 22 +- recipes/virtual-server_rawhide.cfg | 24 +- recipes/virtual-server_rawhide_devel.cfg | 24 +- .../desktop-hypervisor-amdcpu_rawhide.cfg | 25 - ...p-hypervisor-intelcpu-intelgpu_rawhide.cfg | 27 - .../desktop-hypervisor-intelcpu_rawhide.cfg | 25 - .../desktop-hypervisor_amdcpu_rawhide.cfg | 23 - ...p-hypervisor_intelcpu_intelgpu_rawhide.cfg | 23 - .../desktop-hypervisor_intelcpu_rawhide.cfg | 23 - recipes_backup/desktop-hypervisor_rawhide.cfg | 23 - recipes_backup/desktop_rawhide.cfg | 22 - .../live-desktop-hypervisor_rawhide.cfg | 26 - recipes_backup/live-desktop_rawhide.cfg | 22 - .../live-server-hypervisor_rawhide.cfg | 25 - .../live-server_intelcpu_intelgpu_rawhide.cfg | 21 - recipes_backup/live-server_rawhide.cfg | 21 - .../live-server_rawhide_hypervisor.cfg | 21 - recipes_backup/virtual-desktop_43.cfg | 19 - recipes_backup/virtual-desktop_43_devel.cfg | 19 - .../virtual-desktop_devel_rawhide.cfg | 21 - recipes_backup/virtual-desktop_labwc_43.cfg | 19 - .../virtual-desktop_rawhide-encrypted.cfg | 22 - recipes_backup/virtual-desktop_rawhide.cfg | 19 - .../virtual-desktop_rawhide_encrypted.cfg | 19 - recipes_backup/virtual-server_43.cfg | 18 - recipes_backup/virtual-server_43_devel.cfg | 18 - recipes_backup/virtual-server_devel_43.cfg | 19 - .../virtual-server_devel_rawhide.cfg | 19 - recipes_backup/virtual-server_rawhide.cfg | 18 - .../virtual-server_rawhide_devel.cfg | 18 - scripts/generate_recipe.py.bak | 626 ------------------ 47 files changed, 245 insertions(+), 1402 deletions(-) delete mode 100644 .gitignore delete mode 160000 external/kickstart-tests delete mode 160000 external/pykickstart delete mode 100644 recipes_backup/desktop-hypervisor-amdcpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor-intelcpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor_amdcpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor_intelcpu_rawhide.cfg delete mode 100644 recipes_backup/desktop-hypervisor_rawhide.cfg delete mode 100644 recipes_backup/desktop_rawhide.cfg delete mode 100644 recipes_backup/live-desktop-hypervisor_rawhide.cfg delete mode 100644 recipes_backup/live-desktop_rawhide.cfg delete mode 100644 recipes_backup/live-server-hypervisor_rawhide.cfg delete mode 100644 recipes_backup/live-server_intelcpu_intelgpu_rawhide.cfg delete mode 100644 recipes_backup/live-server_rawhide.cfg delete mode 100644 recipes_backup/live-server_rawhide_hypervisor.cfg delete mode 100644 recipes_backup/virtual-desktop_43.cfg delete mode 100644 recipes_backup/virtual-desktop_43_devel.cfg delete mode 100644 recipes_backup/virtual-desktop_devel_rawhide.cfg delete mode 100644 recipes_backup/virtual-desktop_labwc_43.cfg delete mode 100644 recipes_backup/virtual-desktop_rawhide-encrypted.cfg delete mode 100644 recipes_backup/virtual-desktop_rawhide.cfg delete mode 100644 recipes_backup/virtual-desktop_rawhide_encrypted.cfg delete mode 100644 recipes_backup/virtual-server_43.cfg delete mode 100644 recipes_backup/virtual-server_43_devel.cfg delete mode 100644 recipes_backup/virtual-server_devel_43.cfg delete mode 100644 recipes_backup/virtual-server_devel_rawhide.cfg delete mode 100644 recipes_backup/virtual-server_rawhide.cfg delete mode 100644 recipes_backup/virtual-server_rawhide_devel.cfg delete mode 100644 scripts/generate_recipe.py.bak diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 58e9cc6..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.aider* -# dishes/ -# !dishes/ diff --git a/external/kickstart-tests b/external/kickstart-tests deleted file mode 160000 index f3da604..0000000 --- a/external/kickstart-tests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3da604ad81aca1757a55bc970b344f3c4f218a3 diff --git a/external/pykickstart b/external/pykickstart deleted file mode 160000 index 601ec2d..0000000 --- a/external/pykickstart +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 601ec2d2f254909f56e2ee961d2056e0d5bc4a97 diff --git a/recipes/desktop-hypervisor_amdcpu_rawhide.cfg b/recipes/desktop-hypervisor_amdcpu_rawhide.cfg index c21f32b..b906233 100644 --- a/recipes/desktop-hypervisor_amdcpu_rawhide.cfg +++ b/recipes/desktop-hypervisor_amdcpu_rawhide.cfg @@ -7,17 +7,25 @@ # A recipe for a desktop hypervisor -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-amdcpu.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/packages/hardware-support.ks +%ksappend fragments/shared/initial-setup/desktop/config.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/vmm/packages.ks +%ksappend fragments/shared/desktop/vmm/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/hypervisor/base/services.ks +%ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/hypervisor/amdcpu.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg b/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg index 695ee9a..863cf23 100644 --- a/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg +++ b/recipes/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg @@ -7,18 +7,26 @@ # A recipe for a desktop hypervisor -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-intelcpu.cfg -%include ../ingredients/base-hypervisor-intelgpu.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/packages/hardware-support.ks +%ksappend fragments/shared/initial-setup/desktop/config.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/vmm/packages.ks +%ksappend fragments/shared/desktop/vmm/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/hypervisor/base/services.ks +%ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/hypervisor/intelcpu.ks +%ksappend fragments/shared/hypervisor/intelgpu.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_intelcpu_rawhide.cfg b/recipes/desktop-hypervisor_intelcpu_rawhide.cfg index 31fa839..bf2e900 100644 --- a/recipes/desktop-hypervisor_intelcpu_rawhide.cfg +++ b/recipes/desktop-hypervisor_intelcpu_rawhide.cfg @@ -7,17 +7,25 @@ # A recipe for a desktop hypervisor -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-intelcpu.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/packages/hardware-support.ks +%ksappend fragments/shared/initial-setup/desktop/config.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/vmm/packages.ks +%ksappend fragments/shared/desktop/vmm/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/hypervisor/base/services.ks +%ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/hypervisor/intelcpu.ks \ No newline at end of file diff --git a/recipes/desktop-hypervisor_rawhide.cfg b/recipes/desktop-hypervisor_rawhide.cfg index 963645f..fccd321 100644 --- a/recipes/desktop-hypervisor_rawhide.cfg +++ b/recipes/desktop-hypervisor_rawhide.cfg @@ -7,16 +7,24 @@ # A recipe for a desktop hypervisor -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/packages/hardware-support.ks +%ksappend fragments/shared/initial-setup/desktop/config.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/shared/desktop/vmm/packages.ks +%ksappend fragments/shared/desktop/vmm/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/hypervisor/base/services.ks +%ksappend fragments/shared/hypervisor/base/packages.ks +%ksappend fragments/shared/hypervisor/base/post-scripts.ks +%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/live-desktop_rawhide.cfg b/recipes/live-desktop_rawhide.cfg index 8ec195d..c95bdda 100644 --- a/recipes/live-desktop_rawhide.cfg +++ b/recipes/live-desktop_rawhide.cfg @@ -7,17 +7,18 @@ # A recipe for a live desktop -%include ../ingredients/live-core.cfg -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file +%ksappend fragments/shared/live/core/base.ks +%ksappend fragments/shared/live/core/storage.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/live/core/packages.ks +%ksappend fragments/shared/live/post/base.ks +%ksappend fragments/shared/live/post/session.ks +%ksappend fragments/shared/initial-setup/desktop/config.ks +%ksappend fragments/shared/desktop/gnome/config.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/desktop/gnome/post-scripts.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/live-server_rawhide.cfg b/recipes/live-server_rawhide.cfg index d027180..a1f2236 100644 --- a/recipes/live-server_rawhide.cfg +++ b/recipes/live-server_rawhide.cfg @@ -7,16 +7,15 @@ # A recipe for a live server -%include ../ingredients/live-core.cfg -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file +%ksappend fragments/shared/live/core/base.ks +%ksappend fragments/shared/live/core/storage.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/live/core/packages.ks +%ksappend fragments/shared/live/post/base.ks +%ksappend fragments/shared/live/post/session.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/live-server_rawhide_hypervisor.cfg b/recipes/live-server_rawhide_hypervisor.cfg index d027180..a1f2236 100644 --- a/recipes/live-server_rawhide_hypervisor.cfg +++ b/recipes/live-server_rawhide_hypervisor.cfg @@ -7,16 +7,15 @@ # A recipe for a live server -%include ../ingredients/live-core.cfg -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file +%ksappend fragments/shared/live/core/base.ks +%ksappend fragments/shared/live/core/storage.ks +%ksappend fragments/platform/generic-rawhide/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/live/core/packages.ks +%ksappend fragments/shared/live/post/base.ks +%ksappend fragments/shared/live/post/session.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/core/security/enabled.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_43.cfg b/recipes/virtual-desktop_43.cfg index 544c6ec..a56b2c3 100644 --- a/recipes/virtual-desktop_43.cfg +++ b/recipes/virtual-desktop_43.cfg @@ -7,14 +7,16 @@ # A recipe for a virtual desktop -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_43_devel.cfg b/recipes/virtual-desktop_43_devel.cfg index 7d13e11..c44c587 100644 --- a/recipes/virtual-desktop_43_devel.cfg +++ b/recipes/virtual-desktop_43_devel.cfg @@ -7,14 +7,16 @@ # A recipe for a virtual desktop -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/disabled.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_labwc_43.cfg b/recipes/virtual-desktop_labwc_43.cfg index 6184670..c8674e9 100644 --- a/recipes/virtual-desktop_labwc_43.cfg +++ b/recipes/virtual-desktop_labwc_43.cfg @@ -7,14 +7,16 @@ # A recipe for a virtual desktop -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-labwc.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/desktop/labwc/config.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide.cfg b/recipes/virtual-desktop_rawhide.cfg index e41e61b..411a7ca 100644 --- a/recipes/virtual-desktop_rawhide.cfg +++ b/recipes/virtual-desktop_rawhide.cfg @@ -7,15 +7,17 @@ # A recipe for a virtual desktop -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide_encrypted.cfg b/recipes/virtual-desktop_rawhide_encrypted.cfg index 82243a2..76f1232 100644 --- a/recipes/virtual-desktop_rawhide_encrypted.cfg +++ b/recipes/virtual-desktop_rawhide_encrypted.cfg @@ -7,16 +7,18 @@ # A recipe for a virtual desktop -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg -%include ../ingredients/core-storage-encrypted.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/desktop/gnome/packages.ks +%ksappend fragments/shared/guest-agents/packages.ks +%ksappend fragments/shared/storage/encrypted.ks \ No newline at end of file diff --git a/recipes/virtual-server_43.cfg b/recipes/virtual-server_43.cfg index c7beb69..9c6bfe5 100644 --- a/recipes/virtual-server_43.cfg +++ b/recipes/virtual-server_43.cfg @@ -7,13 +7,15 @@ # A recipe for a virtual server -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-server_43_devel.cfg b/recipes/virtual-server_43_devel.cfg index 6122e69..81c610a 100644 --- a/recipes/virtual-server_43_devel.cfg +++ b/recipes/virtual-server_43_devel.cfg @@ -7,13 +7,15 @@ # A recipe for a virtual server -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/disabled.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-server_rawhide.cfg b/recipes/virtual-server_rawhide.cfg index 2382cd3..bdb9d2b 100644 --- a/recipes/virtual-server_rawhide.cfg +++ b/recipes/virtual-server_rawhide.cfg @@ -7,14 +7,16 @@ # A recipe for a virtual server -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/enabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes/virtual-server_rawhide_devel.cfg b/recipes/virtual-server_rawhide_devel.cfg index 9c0aeaa..f0c6074 100644 --- a/recipes/virtual-server_rawhide_devel.cfg +++ b/recipes/virtual-server_rawhide_devel.cfg @@ -7,14 +7,16 @@ # A recipe for a virtual server -%include ../ingredients/core.cfg -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file +%ksappend fragments/shared/core/base.ks +%ksappend fragments/shared/storage/standard.ks +%ksappend fragments/platform/generic-43/bootloader/grub.ks +%ksappend fragments/shared/core/locale.ks +%ksappend fragments/shared/core/services.ks +%ksappend fragments/shared/core/network.ks +%ksappend fragments/shared/packages/core-group.ks +%ksappend fragments/shared/packages/fedora-remix.ks +%ksappend fragments/shared/packages/hand-picked.ks +%ksappend fragments/shared/initial-setup/server/config.ks +%ksappend fragments/shared/core/security/disabled.ks +%ksappend fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks +%ksappend fragments/shared/guest-agents/packages.ks \ No newline at end of file diff --git a/recipes_backup/desktop-hypervisor-amdcpu_rawhide.cfg b/recipes_backup/desktop-hypervisor-amdcpu_rawhide.cfg deleted file mode 100644 index 643c218..0000000 --- a/recipes_backup/desktop-hypervisor-amdcpu_rawhide.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for an AMD (tm) CPU-based desktop hypervisor - -%include ../ingredients/core.cfg # Text mode for automated installation -%include ../ingredients/core-storage.cfg # Storage configuration -%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB -%include ../ingredients/core-locale.cfg # System locale -%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-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-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 -%include ../ingredients/base-hypervisor-amdcpu.cfg # Virtualization configuration for AMD (tm) CPUs \ No newline at end of file diff --git a/recipes_backup/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg b/recipes_backup/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg deleted file mode 100644 index 89bc809..0000000 --- a/recipes_backup/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# 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 - -%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-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-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 -%include ../ingredients/base-hypervisor-intelgpu.cfg # Virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev) diff --git a/recipes_backup/desktop-hypervisor-intelcpu_rawhide.cfg b/recipes_backup/desktop-hypervisor-intelcpu_rawhide.cfg deleted file mode 100644 index 3b83d13..0000000 --- a/recipes_backup/desktop-hypervisor-intelcpu_rawhide.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for an Intel(tm)-based desktop hypervisor - -%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-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-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 -%include ../ingredients/base-hypervisor-intelcpu.cfg # Virtualization configuration for Intel (tm) CPUs diff --git a/recipes_backup/desktop-hypervisor_amdcpu_rawhide.cfg b/recipes_backup/desktop-hypervisor_amdcpu_rawhide.cfg deleted file mode 100644 index 29f70db..0000000 --- a/recipes_backup/desktop-hypervisor_amdcpu_rawhide.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a desktop hypervisor - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-amdcpu.cfg -%include ../ingredients/None.cfg \ No newline at end of file diff --git a/recipes_backup/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg b/recipes_backup/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg deleted file mode 100644 index 038f2ac..0000000 --- a/recipes_backup/desktop-hypervisor_intelcpu_intelgpu_rawhide.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a desktop hypervisor - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-intelcpu.cfg -%include ../ingredients/base-hypervisor-intelgpu.cfg \ No newline at end of file diff --git a/recipes_backup/desktop-hypervisor_intelcpu_rawhide.cfg b/recipes_backup/desktop-hypervisor_intelcpu_rawhide.cfg deleted file mode 100644 index 7fa612c..0000000 --- a/recipes_backup/desktop-hypervisor_intelcpu_rawhide.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a desktop hypervisor - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor-intelcpu.cfg -%include ../ingredients/None.cfg \ No newline at end of file diff --git a/recipes_backup/desktop-hypervisor_rawhide.cfg b/recipes_backup/desktop-hypervisor_rawhide.cfg deleted file mode 100644 index 96470c2..0000000 --- a/recipes_backup/desktop-hypervisor_rawhide.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a desktop hypervisor - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-packages-hardware-support.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-desktop-virtual-machine-manager.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-hypervisor.cfg -%include ../ingredients/None.cfg \ No newline at end of file diff --git a/recipes_backup/desktop_rawhide.cfg b/recipes_backup/desktop_rawhide.cfg deleted file mode 100644 index f37b0a2..0000000 --- a/recipes_backup/desktop_rawhide.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a generic desktop hypervisor - -%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-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-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_backup/live-desktop-hypervisor_rawhide.cfg b/recipes_backup/live-desktop-hypervisor_rawhide.cfg deleted file mode 100644 index 33fcee8..0000000 --- a/recipes_backup/live-desktop-hypervisor_rawhide.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live desktop hypervisor - -%include ../ingredients/live-core.cfg # For live systems only -%include ../ingredients/live-core-storage.cfg # For live systems only -%include ../ingredients/live-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-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-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_backup/live-desktop_rawhide.cfg b/recipes_backup/live-desktop_rawhide.cfg deleted file mode 100644 index b7e0f82..0000000 --- a/recipes_backup/live-desktop_rawhide.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live desktop - -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-gnome-desktop.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file diff --git a/recipes_backup/live-server-hypervisor_rawhide.cfg b/recipes_backup/live-server-hypervisor_rawhide.cfg deleted file mode 100644 index 9020f49..0000000 --- a/recipes_backup/live-server-hypervisor_rawhide.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live server hypervisor - -%include ../ingredients/live-core.cfg # For live systems only -%include ../ingredients/live-core-storage.cfg # For live systems only -%include ../ingredients/live-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/live-core-mandatory-packages.cfg # For live systems -%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-server.cfg # For headless systems -%include ../ingredients/base-hypervisor.cfg # Base hyperviso \ No newline at end of file diff --git a/recipes_backup/live-server_intelcpu_intelgpu_rawhide.cfg b/recipes_backup/live-server_intelcpu_intelgpu_rawhide.cfg deleted file mode 100644 index a32cc96..0000000 --- a/recipes_backup/live-server_intelcpu_intelgpu_rawhide.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live server - -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file diff --git a/recipes_backup/live-server_rawhide.cfg b/recipes_backup/live-server_rawhide.cfg deleted file mode 100644 index a32cc96..0000000 --- a/recipes_backup/live-server_rawhide.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live server - -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file diff --git a/recipes_backup/live-server_rawhide_hypervisor.cfg b/recipes_backup/live-server_rawhide_hypervisor.cfg deleted file mode 100644 index a32cc96..0000000 --- a/recipes_backup/live-server_rawhide_hypervisor.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a live server - -%include ../ingredients/live-core-storage.cfg -%include ../ingredients/live-core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/live-core-mandatory-packages.cfg -%include ../ingredients/live-core-post.cfg -%include ../ingredients/live-core-post-live-session.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-fedora-repo-rawhide.cfg -%include ../ingredients/core-security-on.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-desktop_43.cfg b/recipes_backup/virtual-desktop_43.cfg deleted file mode 100644 index e2cf11f..0000000 --- a/recipes_backup/virtual-desktop_43.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-desktop_43_devel.cfg b/recipes_backup/virtual-desktop_43_devel.cfg deleted file mode 100644 index 90c1114..0000000 --- a/recipes_backup/virtual-desktop_43_devel.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-desktop_devel_rawhide.cfg b/recipes_backup/virtual-desktop_devel_rawhide.cfg deleted file mode 100644 index 9186fc5..0000000 --- a/recipes_backup/virtual-desktop_devel_rawhide.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# Unsafe. Development-only. 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-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.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-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_backup/virtual-desktop_labwc_43.cfg b/recipes_backup/virtual-desktop_labwc_43.cfg deleted file mode 100644 index edf732a..0000000 --- a/recipes_backup/virtual-desktop_labwc_43.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-labwc.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-desktop_rawhide-encrypted.cfg b/recipes_backup/virtual-desktop_rawhide-encrypted.cfg deleted file mode 100644 index 145f035..0000000 --- a/recipes_backup/virtual-desktop_rawhide-encrypted.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop with an encrypted root partition - -%include ../ingredients/core.cfg # Text mode -%include ../ingredients/core-storage-encrypted.cfg # ext4-based storage configuration with encryption -%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-rawhide.cfg # Official repositories for Fedora Rawhide -%include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment -%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_backup/virtual-desktop_rawhide.cfg b/recipes_backup/virtual-desktop_rawhide.cfg deleted file mode 100644 index e2cf11f..0000000 --- a/recipes_backup/virtual-desktop_rawhide.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-desktop_rawhide_encrypted.cfg b/recipes_backup/virtual-desktop_rawhide_encrypted.cfg deleted file mode 100644 index e2cf11f..0000000 --- a/recipes_backup/virtual-desktop_rawhide_encrypted.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual desktop - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-desktop-gnome.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-server_43.cfg b/recipes_backup/virtual-server_43.cfg deleted file mode 100644 index 269328a..0000000 --- a/recipes_backup/virtual-server_43.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual server - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-server_43_devel.cfg b/recipes_backup/virtual-server_43_devel.cfg deleted file mode 100644 index dea670c..0000000 --- a/recipes_backup/virtual-server_43_devel.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual server - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-server_devel_43.cfg b/recipes_backup/virtual-server_devel_43.cfg deleted file mode 100644 index 4867b89..0000000 --- a/recipes_backup/virtual-server_devel_43.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# # Unsafe. Development-only. A recipe for a virtual server - -%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-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.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_backup/virtual-server_devel_rawhide.cfg b/recipes_backup/virtual-server_devel_rawhide.cfg deleted file mode 100644 index 696fd23..0000000 --- a/recipes_backup/virtual-server_devel_rawhide.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# # Unsafe. Development-only. A recipe for a virtual server - -%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-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.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_backup/virtual-server_rawhide.cfg b/recipes_backup/virtual-server_rawhide.cfg deleted file mode 100644 index 269328a..0000000 --- a/recipes_backup/virtual-server_rawhide.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual server - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-on.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/recipes_backup/virtual-server_rawhide_devel.cfg b/recipes_backup/virtual-server_rawhide_devel.cfg deleted file mode 100644 index dea670c..0000000 --- a/recipes_backup/virtual-server_rawhide_devel.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# A recipe for a virtual server - -%include ../ingredients/core-storage.cfg -%include ../ingredients/core-bootloader-grub.cfg -%include ../ingredients/core-locale.cfg -%include ../ingredients/core-services.cfg -%include ../ingredients/core-network.cfg -%include ../ingredients/core-packages.cfg -%include ../ingredients/core-initial-setup-server.cfg -%include ../ingredients/core-security-off.cfg -%include ../ingredients/base-guest-agents.cfg \ No newline at end of file diff --git a/scripts/generate_recipe.py.bak b/scripts/generate_recipe.py.bak deleted file mode 100644 index 08fe334..0000000 --- a/scripts/generate_recipe.py.bak +++ /dev/null @@ -1,626 +0,0 @@ -#!/usr/bin/env python3 -""" -Recipe Generator for Phyllome OS Kickstart Files - -Generates .cfg recipe files from templates and YAML manifest. -""" - -import argparse -import sys -import yaml -from pathlib import Path -from typing import Dict, List, Optional, Any - - -# Deprecated/removed command mappings for Fedora 43 (F42) and rawhide -DEPRECATED_COMMANDS: Dict[str, Dict[str, str]] = { - 'authconfig': { - 'status': 'removed', - 'removed_in': 'F34', - 'alternative': 'authselect', - 'message': 'authconfig was removed in Fedora 34. Use authselect instead.' - }, - 'keyboard': { - 'status': 'deprecated', - 'deprecated_in': 'F18', - 'alternative': 'keyboard --vckeymap', - 'message': 'keyboard command is deprecated. Use keyboard --vckeymap instead.' - }, - 'langsupport': { - 'status': 'deprecated', - 'deprecated_in': 'F21', - 'alternative': 'lang', - 'message': 'langsupport is deprecated. Use lang command instead.' - }, - 'nfs': { - 'status': 'deprecated', - 'deprecated_in': 'F23', - 'alternative': 'repo --name=nfs', - 'message': 'nfs command is deprecated. Use repo command instead.' - }, - 'parted': { - 'status': 'deprecated', - 'deprecated_in': 'F13', - 'alternative': 'part', - 'message': 'parted command is deprecated. Use part command instead.' - }, -} - - -def _import_pykickstart(): - """Import pykickstart modules, returns None if not available.""" - try: - from pykickstart.parser import KickstartParser - from pykickstart.version import makeVersion - from pykickstart.version import DEVEL - from pykickstart.errors import KickstartParseError, KickstartError - return { - 'parser': KickstartParser, - 'makeVersion': makeVersion, - 'DEVEL': DEVEL, - 'KickstartParseError': KickstartParseError, - 'KickstartError': KickstartError - } - except ImportError: - return None - - -class RecipeGenerator: - """Generate kickstart recipes from templates and modifiers.""" - - def __init__(self, ingredients_dir: Path, templates_file: Path): - # Resolve ingredients_dir relative to the project root (parent of scripts/) - self.project_root = Path(__file__).parent.parent - self.ingredients_dir = self.project_root / ingredients_dir - self.templates = self.load_templates(templates_file) - - def get_ksversion(self, version: str) -> Optional[str]: - """Map Phyllome OS version to pykickstart version string.""" - if version == 'rawhide': - return None - else: - return f'F{int(version) - 1}' - - def load_templates(self, path: Path) -> Dict: - """Load recipe templates from YAML file.""" - try: - # Template path could be: - # - Absolute path (already resolved) - # - Relative path (resolve relative to project root) - if path.is_absolute(): - template_path = path - else: - template_path = self.project_root / 'scripts' / path - with open(template_path) as f: - data = yaml.safe_load(f) - return data['templates'] - except FileNotFoundError: - print(f"Error: Templates file not found: {template_path}", file=sys.stderr) - sys.exit(2) - except yaml.YAMLError as e: - print(f"Error: Invalid YAML in {template_path}: {e}", file=sys.stderr) - sys.exit(2) - - def validate_template(self, template: Dict) -> List[str]: - """Validate template structure and ingredient existence.""" - errors = [] - - # Check required keys - required_keys = ['description', 'base', 'required'] - for key in required_keys: - if key not in template: - errors.append(f"Missing required key: {key}") - - # Validate base ingredient exists - if 'base' in template: - base_path = self.ingredients_dir / f"{template['base']}.cfg" - if not base_path.exists(): - errors.append(f"Base ingredient not found: {template['base']}.cfg") - - # Validate required ingredients exist - for item in template.get('required', []): - if isinstance(item, dict): - inc_name = list(item.values())[0] - else: - inc_name = item - inc_path = self.ingredients_dir / f"{inc_name}.cfg" - if not inc_path.exists(): - errors.append(f"Required ingredient not found: {inc_name}.cfg") - - # Validate optional ingredient values - for opt_key, opt_config in template.get('optional', {}).items(): - if isinstance(opt_config, dict): - for value, inc_name in opt_config.items(): - inc_path = self.ingredients_dir / f"{inc_name}.cfg" - if not inc_path.exists(): - errors.append(f"Optional ingredient not found: {inc_name}.cfg (for {opt_key}={value})") - elif isinstance(opt_config, list): - for inc_name in opt_config: - inc_path = self.ingredients_dir / f"{inc_name}.cfg" - if not inc_path.exists(): - errors.append(f"Optional ingredient not found: {inc_name}.cfg (in list)") - - return errors - - def validate_manifest(self, manifest: Dict) -> List[str]: - """Validate manifest structure.""" - errors = [] - - if 'recipes' not in manifest: - errors.append("Manifest missing 'recipes' key") - return errors - - for recipe_config in manifest['recipes']: - if 'name' not in recipe_config: - errors.append("Recipe config missing 'name' key") - if 'variants' not in recipe_config: - errors.append(f"Recipe '{recipe_config.get('name', 'unnamed')}' missing 'variants' key") - continue - - for variant in recipe_config['variants']: - if 'version' not in variant: - errors.append(f"Recipe '{recipe_config['name']}' variant missing 'version'") - - return errors - - def generate_recipe(self, recipe_type: str, version: str, **modifiers) -> str: - """Generate a recipe from template with modifiers.""" - if recipe_type not in self.templates: - print(f"Error: Unknown recipe type: {recipe_type}", file=sys.stderr) - sys.exit(1) - - template = self.templates[recipe_type] - - # Validate template - errors = self.validate_template(template) - if errors: - print(f"Error: Invalid template '{recipe_type}':", file=sys.stderr) - for error in errors: - print(f" - {error}", file=sys.stderr) - sys.exit(1) - - lines = self.build_header(template['description'], recipe_type, version, modifiers) - lines.extend(self.build_includes(template, version, modifiers)) - - return '\n'.join(lines) - - def build_header(self, description: str, recipe_type: str, - version: str, modifiers: Dict) -> List[str]: - """Build the ASCII art header and description.""" - header = [ - "# __ ____ ____ _____", - "# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \\/ ___/", - "# / __ \\/ __ \\/ / / / / / __ \\/ __ `__ \\/ _ \\ / / / /\\__ \\", - "# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ /", - "# / .___/_/ /_/\\__, /_/_/\\____/_/ /_/ /_/\\___/ \\____//____/", - "# /_/ /____/", - "", - f"# {description}", - "", - ] - return header - - def build_includes(self, template: Dict, version: str, modifiers: Dict) -> List[str]: - """Build %include lines from template and modifiers.""" - includes = [] - seen = set() # Track to prevent duplicates - # Add version to modifiers for template processing - modifiers = modifiers.copy() - modifiers['version'] = version - - # Add required includes - for item in template.get('required', []): - if isinstance(item, dict): - inc_name = list(item.values())[0] - else: - inc_name = item - - inc_file = f"{inc_name}.cfg" - if inc_file not in seen: - includes.append(f"%include ../ingredients/{inc_file}") - seen.add(inc_file) - - # Add optional includes based on modifiers - for opt_key, opt_config in template.get('optional', {}).items(): - if opt_key in modifiers: - value = modifiers[opt_key] - if isinstance(opt_config, dict): - if value in opt_config: - inc_file = f"{opt_config[value]}.cfg" - if inc_file not in seen: - includes.append(f"%include ../ingredients/{inc_file}") - seen.add(inc_file) - elif isinstance(opt_config, list) and value is True: - for item in opt_config: - inc_file = f"{item}.cfg" - if inc_file not in seen: - includes.append(f"%include ../ingredients/{inc_file}") - seen.add(inc_file) - - # Handle special modifiers (CPU, GPU) - for mod_key, mod_value in modifiers.items(): - if mod_key in template.get('modifiers', {}): - mod_config = template['modifiers'][mod_key] - if isinstance(mod_config, dict) and mod_value in mod_config: - inc_file = f"{mod_config[mod_value]}.cfg" - if inc_file not in seen: - includes.append(f"%include ../ingredients/{inc_file}") - seen.add(inc_file) - - return includes - - def validate_recipe(self, content: str) -> List[str]: - """Validate recipe content, return list of warnings/errors.""" - issues = [] - includes = [line for line in content.split('\n') if line.startswith('%include')] - - # Check for duplicate includes - seen = set() - for inc in includes: - parts = inc.split() - if len(parts) < 2: - continue - path = parts[1] - if path in seen: - issues.append(f"Duplicate include: {path}") - seen.add(path) - - # Check ingredient existence - for inc in includes: - parts = inc.split() - if len(parts) < 2: - continue - path = parts[1] - inc_path = self.ingredients_dir / path - if not inc_path.exists(): - issues.append(f"Missing ingredient: {path}") - - return issues - - def validate_recipe_semantic(self, content: str, version: str) -> List[str]: - """Validate recipe using pykickstart parser with version-specific checks.""" - issues = [] - - modules = _import_pykickstart() - if modules is None: - issues.append("Warning: pykickstart not installed, skipping semantic validation") - return issues - - KickstartParser = modules['parser'] - makeVersion = modules['makeVersion'] - KickstartParseError = modules['KickstartParseError'] - KickstartError = modules['KickstartError'] - - ks_version_str = self.get_ksversion(version) - if ks_version_str: - ks_version = makeVersion(ks_version_str) - else: - ks_version = makeVersion(modules['DEVEL']) - - try: - parser = KickstartParser(ks_version) - parser.readKickstartFromString(content) - except KickstartParseError as e: - issues.append(f"Syntax error line {e.lineno}: {e.message}") - except KickstartError as e: - issues.append(f"Validation error: {str(e)}") - except Exception as e: - issues.append(f"Unexpected error during parsing: {str(e)}") - - # Check for deprecated commands in the content - issues.extend(self._check_deprecated_commands(content)) - - return issues - - def _check_deprecated_commands(self, content: str) -> List[str]: - """Check for deprecated and removed commands with suggestions.""" - issues = [] - - for line_num, line in enumerate(content.split('\n'), start=1): - # Skip comments and empty lines - stripped = line.strip() - if not stripped or stripped.startswith('#'): - continue - - # Extract command (first word after % if in section, or just the first word) - if stripped.startswith('%'): - continue # Skip section headers - - parts = stripped.split() - if not parts: - continue - - cmd = parts[0] - - if cmd in DEPRECATED_COMMANDS: - cmd_info = DEPRECATED_COMMANDS[cmd] - status = cmd_info['status'] - msg = cmd_info['message'] - - if status == 'removed': - issues.append(f"ERROR: Line {line_num}: {msg}") - else: - issues.append(f"Warning: Line {line_num}: {msg}") - - return issues - - def extract_version(self, content: str, filename: str) -> Optional[str]: - """Extract Fedora version from recipe content or filename.""" - import re - filename_match = re.search(r'(?:_|-)(43|rawhide)(?:_|-|.cfg|.yaml|$)', filename) - if filename_match: - return filename_match.group(1) - - for line in content.split('\n'): - if 'core-fedora-repo-43' in line: - return '43' - elif 'core-fedora-repo-rawhide' in line: - return 'rawhide' - - return None - - def generate_filename(self, recipe_type: str, version: str, **modifiers) -> str: - """Generate recipe filename from parameters.""" - # Map modifiers to filename components - parts = [recipe_type.replace('_', '-')] - - # Add CPU/GPU first (hypervisors) - if modifiers.get('cpu') and modifiers.get('cpu') != 'generic': - parts.append(modifiers['cpu']) - if modifiers.get('gpu') and modifiers.get('gpu') != 'none': - parts.append(modifiers['gpu']) - - # Add desktop (non-GNOME only, since GNOME is default) - if modifiers.get('desktop') and modifiers['desktop'] != 'gnome': - parts.append(modifiers['desktop']) - - # Add version - parts.append(str(version)) - - # Add hypervisor suffix (only when hypervisor is enabled) - if modifiers.get('hypervisor'): - parts.append('hypervisor') - - # Add security suffix (devel only, since secure is default) - if modifiers.get('security') == 'devel': - parts.append('devel') - - # Add storage suffix (encrypted only, since standard is default) - if modifiers.get('storage') == 'encrypted': - parts.append('encrypted') - - return '_'.join(parts) + '.cfg' - - -def main(): - parser = argparse.ArgumentParser( - description='Generate Phyllome OS kickstart recipes from templates', - formatter_class=argparse.RawDescriptionHelpFormatter - ) - - # Global options - # Use __file__ to find the scripts directory, then go up to project root - SCRIPTS_DIR = Path(__file__).resolve().parent - PROJECT_ROOT = SCRIPTS_DIR.parent - - parser.add_argument('--ingredients', '-i', - type=Path, default=PROJECT_ROOT / 'ingredients', - help='Ingredients directory (default: parent/ingredients)') - parser.add_argument('--templates', '-t', - type=Path, default=SCRIPTS_DIR / 'recipe_templates.yaml', - help='Templates YAML file (default: parent/recipe_templates.yaml)') - - # Batch mode - parser.add_argument('--manifest', '-m', - type=Path, help='Manifest YAML for batch generation') - parser.add_argument('--output-dir', '-d', - type=Path, default=Path(__file__).parent / 'recipes', - help='Output directory (batch generation, default: parent/recipes)') - parser.add_argument('--dry-run', '-n', - action='store_true', - help='Show what would be generated without writing files') - - # Single generation mode - parser.add_argument('--type', '-T', - help='Recipe type (e.g., virtual-desktop)') - parser.add_argument('--output', '-o', - type=Path, help='Output file (single generation)') - - # Recipe parameters - parser.add_argument('--version', '-v', - choices=['43', 'rawhide'], default='rawhide', - help='Fedora version (default: rawhide)') - parser.add_argument('--desktop', - choices=['gnome', 'labwc'], - help='Desktop environment (default: gnome)') - parser.add_argument('--storage', - choices=['standard', 'encrypted'], - help='Storage type (default: standard)') - parser.add_argument('--security', - choices=['secure', 'devel'], - help='Security mode (default: secure)') - parser.add_argument('--cpu', - choices=['generic', 'amdcpu', 'intelcpu'], - help='CPU optimization') - parser.add_argument('--gpu', - choices=['none', 'intelgpu'], - default='none', - help='GPU passthrough (default: none)') - - # Validation mode - parser.add_argument('--validate', '-V', - nargs='+', - help='Validate recipe files') - - # Strict mode for CI - parser.add_argument('--strict', - action='store_true', - help='Treat warnings as errors (CI mode)') - - args = parser.parse_args() - - # Initialize generator - generator = RecipeGenerator(args.ingredients, args.templates) - - # Validation mode - if args.validate: - all_issues = [] - for recipe_path in args.validate: - try: - with open(recipe_path) as f: - content = f.read() - issues = generator.validate_recipe(content) - - # Extract version and perform semantic validation - filename = Path(recipe_path).stem - version = generator.extract_version(content, filename) - if version: - semantic_issues = generator.validate_recipe_semantic(content, version) - issues.extend(semantic_issues) - else: - issues.append("Warning: Could not determine version, skipping semantic validation") - - if issues: - all_issues.append((recipe_path, issues)) - except FileNotFoundError: - print(f"Error: Recipe not found: {recipe_path}", file=sys.stderr) - sys.exit(2) - - if all_issues: - print("=== Recipe Validation Report ===", file=sys.stderr) - for path, issues in all_issues: - print(f"\n{path}:", file=sys.stderr) - error_count = sum(1 for i in issues if 'ERROR' in i) - warning_count = sum(1 for i in issues if 'Warning:' in i) - - if error_count > 0: - for issue in issues: - if 'ERROR' in issue: - print(f" {issue}", file=sys.stderr) - - if warning_count > 0: - for issue in issues: - if 'Warning:' in issue: - print(f" {issue}", file=sys.stderr) - - if error_count == 0 and warning_count == 0: - print(f" No issues found (file exists)", file=sys.stderr) - - print(f"\nSummary:", file=sys.stderr) - print(f" - {len(all_issues)} recipe(s) checked", file=sys.stderr) - - total_errors = sum(len([i for i in issues if 'ERROR' in i]) for _, issues in all_issues) - total_warnings = sum(len([i for i in issues if 'Warning:' in i]) for _, issues in all_issues) - print(f" - {total_errors} error(s), {total_warnings} warning(s)", file=sys.stderr) - - # Strict mode: treat warnings as errors - if args.strict and total_warnings > 0: - print("\nStrict mode: Warnings treated as errors", file=sys.stderr) - sys.exit(1) - - if total_errors > 0: - sys.exit(1) - else: - print("All recipes validated successfully") - sys.exit(0) - - # Batch generation mode - if args.manifest: - try: - with open(args.manifest) as f: - manifest = yaml.safe_load(f) - except FileNotFoundError: - print(f"Error: Manifest file not found: {args.manifest}", file=sys.stderr) - sys.exit(2) - except yaml.YAMLError as e: - print(f"Error: Invalid YAML in manifest: {e}", file=sys.stderr) - sys.exit(2) - - # Validate manifest - errors = generator.validate_manifest(manifest) - if errors: - print(f"Error: Invalid manifest:", file=sys.stderr) - for error in errors: - print(f" - {error}", file=sys.stderr) - sys.exit(1) - - # Generate all recipes - for recipe_config in manifest.get('recipes', []): - recipe_type = recipe_config['name'] - if recipe_type not in generator.templates: - print(f"Error: Unknown recipe type in manifest: {recipe_type}", file=sys.stderr) - sys.exit(1) - - for variant in recipe_config.get('variants', []): - version = variant['version'] - modifiers = {k: v for k, v in variant.items() if k not in ['version']} - - content = generator.generate_recipe(recipe_type, version, **modifiers) - - if args.validate and not args.dry_run: - issues = generator.validate_recipe(content) - semantic_issues = generator.validate_recipe_semantic(content, version) - all_issues = issues + semantic_issues - if all_issues: - print(f"Validation issues for {recipe_type} {version}:", file=sys.stderr) - for issue in issues: - print(f" - {issue}", file=sys.stderr) - sys.exit(1) - - filename = generator.generate_filename(recipe_type, version, **modifiers) - output_path = args.output_dir / filename - - if args.dry_run: - print(f"Would generate: {output_path}") - else: - print(f"Generating: {output_path}") - with open(output_path, 'w') as f: - f.write(content) - - sys.exit(0) - - # Single generation mode - if args.type: - modifiers = { - 'desktop': args.desktop if args.desktop and args.desktop != 'gnome' else None, - 'storage': args.storage if args.storage != 'standard' else None, - 'security': args.security if args.security != 'secure' else None, - 'cpu': args.cpu if args.cpu and args.cpu != 'generic' else None, - 'gpu': args.gpu if args.gpu and args.gpu != 'none' else None, - } - # Filter out None/False values - modifiers = {k: v for k, v in modifiers.items() if v is not None} - - content = generator.generate_recipe(args.type, args.version, **modifiers) - - if args.validate: - issues = generator.validate_recipe(content) - semantic_issues = generator.validate_recipe_semantic(content, args.version) - all_issues = issues + semantic_issues - if all_issues: - print("Validation issues:", file=sys.stderr) - for issue in issues: - print(f" - {issue}", file=sys.stderr) - sys.exit(1) - else: - print("Validation passed") - - if args.output: - if args.dry_run: - print(f"Would write to: {args.output}") - else: - with open(args.output, 'w') as f: - f.write(content) - print(f"Generated: {args.output}") - else: - print(content) - - sys.exit(0) - - # No mode specified, show help - parser.print_help() - sys.exit(1) - - -if __name__ == '__main__': - main()