Fix duplicate storage configuration in recipes

- Move storage options from 'modifiers' to 'required' in recipe_templates.yaml
- Changed required.storage from {'ext4': storage/standard.ks} to {'standard': ..., 'encrypted': ...}
- Removed storage from modifiers section
- This ensures storage: encrypted recipes include only storage/encrypted.ks
- Updated generated recipes and dishes to reflect the fix
This commit is contained in:
Lukas Greve
2026-03-27 16:06:57 +01:00
parent a4bc2967e5
commit 6f5d7478be
45 changed files with 1230 additions and 1560 deletions
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
+1 -2
View File
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -10,7 +10,7 @@
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include storage/encrypted.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
@@ -19,7 +19,6 @@
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include storage/encrypted.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
@@ -1,27 +0,0 @@
# __ ____ ____ _____
# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/
# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \
# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ /
# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/
# /_/ /____/
# Universal template to generate kickstart recipes for a server, a desktop or a hypervisor system
%include repo/fedora-43-mirrors.ks
%include core/base.ks
%include bootloader/grub.ks
%include storage/standard.ks
%include core/locale.ks
%include core/services.ks
%include core/network.ks
%include packages/core.ks
%include packages/fedora-remix.ks
%include packages/hand-picked.ks
%include core/security/enabled.ks
%include initial-setup/server/config.ks
%include packages/virtual-machine-manager/packages.ks
%include packages/virtual-machine-manager/post-scripts.ks
%include desktop/gnome/config.ks
%include desktop/gnome/packages.ks
%include desktop/gnome/post-scripts.ks
%include hypervisor/intelcpu.ks