From c1c5fa8d07472003d44abb3618550d43a3e07c20 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Tue, 24 Mar 2026 16:00:32 +0100 Subject: [PATCH] Updated dishes, including one with luks encryption --- dishes/desktop-hypervisor-amdcpu_rawhide.cfg | 5 +- ...p-hypervisor-intelcpu-intelgpu_rawhide.cfg | 2 +- .../desktop-hypervisor-intelcpu_rawhide.cfg | 5 +- dishes/desktop-hypervisor_rawhide.cfg | 5 +- dishes/desktop_rawhide.cfg | 5 +- dishes/live-desktop-hypervisor_rawhide.cfg | 5 +- dishes/live-desktop_rawhide.cfg | 5 +- dishes/live-server-hypervisor_rawhide.cfg | 2 +- dishes/live-server_rawhide.cfg | 2 +- dishes/virtual-desktop_43.cfg | 5 +- dishes/virtual-desktop_43_devel.cfg | 5 +- dishes/virtual-desktop_devel_rawhide.cfg | 5 +- dishes/virtual-desktop_labwc_43.cfg | 2 +- dishes/virtual-desktop_rawhide-encrypted.cfg | 152 ++++++++++++++++++ dishes/virtual-desktop_rawhide.cfg | 6 +- dishes/virtual-server_43.cfg | 2 +- dishes/virtual-server_devel_43.cfg | 2 +- dishes/virtual-server_devel_rawhide.cfg | 2 +- dishes/virtual-server_rawhide.cfg | 2 +- ingredients/core-storage-encrypted.cfg | 6 + recipes/virtual-desktop_rawhide-encrypted.cfg | 22 +++ recipes/virtual-desktop_rawhide.cfg | 1 - 22 files changed, 228 insertions(+), 20 deletions(-) create mode 100644 dishes/virtual-desktop_rawhide-encrypted.cfg create mode 100644 ingredients/core-storage-encrypted.cfg create mode 100644 recipes/virtual-desktop_rawhide-encrypted.cfg diff --git a/dishes/desktop-hypervisor-amdcpu_rawhide.cfg b/dishes/desktop-hypervisor-amdcpu_rawhide.cfg index ca36c91..2b30ba8 100644 --- a/dishes/desktop-hypervisor-amdcpu_rawhide.cfg +++ b/dishes/desktop-hypervisor-amdcpu_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -258,6 +258,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-kvm usbutils virt-install diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg index 0f330b0..785cc71 100644 --- a/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg +++ b/dishes/desktop-hypervisor-intelcpu-intelgpu_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/dishes/desktop-hypervisor-intelcpu_rawhide.cfg b/dishes/desktop-hypervisor-intelcpu_rawhide.cfg index fc1c7bd..45163d7 100644 --- a/dishes/desktop-hypervisor-intelcpu_rawhide.cfg +++ b/dishes/desktop-hypervisor-intelcpu_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -258,6 +258,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-kvm usbutils virt-install diff --git a/dishes/desktop-hypervisor_rawhide.cfg b/dishes/desktop-hypervisor_rawhide.cfg index 8b6bd16..3f54bbc 100644 --- a/dishes/desktop-hypervisor_rawhide.cfg +++ b/dishes/desktop-hypervisor_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -250,6 +250,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-kvm usbutils virt-install diff --git a/dishes/desktop_rawhide.cfg b/dishes/desktop_rawhide.cfg index 3e4cd14..f4583e9 100644 --- a/dishes/desktop_rawhide.cfg +++ b/dishes/desktop_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -142,6 +142,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio usbutils wget diff --git a/dishes/live-desktop-hypervisor_rawhide.cfg b/dishes/live-desktop-hypervisor_rawhide.cfg index c393082..2275027 100644 --- a/dishes/live-desktop-hypervisor_rawhide.cfg +++ b/dishes/live-desktop-hypervisor_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Firewall configuration firewall --enabled @@ -306,6 +306,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-kvm usbutils virt-install diff --git a/dishes/live-desktop_rawhide.cfg b/dishes/live-desktop_rawhide.cfg index 57efb8b..b0b14e0 100644 --- a/dishes/live-desktop_rawhide.cfg +++ b/dishes/live-desktop_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Firewall configuration firewall --enabled @@ -206,6 +206,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio usbutils wget diff --git a/dishes/live-server-hypervisor_rawhide.cfg b/dishes/live-server-hypervisor_rawhide.cfg index 697e798..c261ba8 100644 --- a/dishes/live-server-hypervisor_rawhide.cfg +++ b/dishes/live-server-hypervisor_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Firewall configuration firewall --enabled diff --git a/dishes/live-server_rawhide.cfg b/dishes/live-server_rawhide.cfg index 151783d..bbf388f 100644 --- a/dishes/live-server_rawhide.cfg +++ b/dishes/live-server_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Firewall configuration firewall --enabled diff --git a/dishes/virtual-desktop_43.cfg b/dishes/virtual-desktop_43.cfg index b2f34bf..1614a92 100644 --- a/dishes/virtual-desktop_43.cfg +++ b/dishes/virtual-desktop_43.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -142,6 +142,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-guest-agent spice-vdagent usbutils diff --git a/dishes/virtual-desktop_43_devel.cfg b/dishes/virtual-desktop_43_devel.cfg index b0299fe..1ba9029 100644 --- a/dishes/virtual-desktop_43_devel.cfg +++ b/dishes/virtual-desktop_43_devel.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -134,6 +134,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-guest-agent spice-vdagent usbutils diff --git a/dishes/virtual-desktop_devel_rawhide.cfg b/dishes/virtual-desktop_devel_rawhide.cfg index a55d7bf..b091304 100644 --- a/dishes/virtual-desktop_devel_rawhide.cfg +++ b/dishes/virtual-desktop_devel_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -133,6 +133,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-guest-agent spice-vdagent usbutils diff --git a/dishes/virtual-desktop_labwc_43.cfg b/dishes/virtual-desktop_labwc_43.cfg index 9dbbb17..fd00ae6 100644 --- a/dishes/virtual-desktop_labwc_43.cfg +++ b/dishes/virtual-desktop_labwc_43.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/dishes/virtual-desktop_rawhide-encrypted.cfg b/dishes/virtual-desktop_rawhide-encrypted.cfg new file mode 100644 index 0000000..a32568d --- /dev/null +++ b/dishes/virtual-desktop_rawhide-encrypted.cfg @@ -0,0 +1,152 @@ +# Generated by pykickstart v3.66 +#version=DEVEL +# Use text mode install +text +# Firewall configuration +firewall --enabled +# Run the Setup Agent on first boot +firstboot --reconfig +# Keyboard layouts +keyboard --xlayouts='ch (fr)' +# System language +lang en_US.UTF-8 +# Network information +network --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate +# Shutdown after installation +shutdown +repo --name="rawhide" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 +#Root password +rootpw --lock +# SELinux configuration +selinux --enforcing +# System services +services --enabled="NetworkManager,systemd-resolved" +# System timezone +timezone Europe/Zurich --utc +# Use network installation +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64" +# X Window System configuration information +xconfig --defaultdesktop=GNOME --startxonboot +# System bootloader configuration +bootloader --location=mbr --timeout=1 +# Clear the Master Boot Record +zerombr +# Partition clearing information +clearpart --all --initlabel +# Disk partitioning information +part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label=efi +part /boot --fstype="ext4" --size=2048 --label=boot +part / --fstype="ext4" --grow --label=root --encrypted --mkfsoptions="-O encrypt,fast_commit" + +%post --logfile=/mnt/sysimage/root/post.log + +localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful + +%end + +%post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome.log + +# cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF +# [org.gnome.desktop.background] +# picture-uri='file:///usr/share/backgrounds/elementary/Morskie Oko.jpg' +# EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.media-handling.gschema.override<< EOF +[org.gnome.desktop.media-handling] +automount-open=false +autorun-never=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.Terminal.gschema.override<< EOF +[org.gnome.Terminal.Legacy.Profile] +font='DejaVu Sans Mono 12' +use-system-font=false +audible-bell=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.override<< EOF +[org.gnome.desktop.wm.preferences] +button-layout=':minimize,maximize,close' +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.a11y.gschema.override<< EOF +[org.gnome.desktop.a11y] +always-show-universal-access-status=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.interface.gschema.override<< EOF +[org.gnome.desktop.interface] +enable-animations=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.privacy.gschema.override<< EOF +[org.gnome.desktop.privacy] +remove-old-temp-files=true +remember-recent-files=false +remember-app-usage=false +disable-camera=true +disable-microphone=true +disable-sound-output=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.search-providers.gschema.override<< EOF +[org.gnome.desktop.search-providers] +disable-external=true +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.notifications.gschema.override<< EOF +[org.gnome.desktop.notifications.application] +enable-sound-alerts=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.sound.gschema.override<< EOF +[org.gnome.desktop.sound] +event-sounds=false +EOF + +cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.thumbnailers.gschema.override<< EOF +[org.gnome.desktop.thumbnailers] +disable-all=true +EOF + +glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ + +%end + +%packages --exclude-weakdeps +@base-graphical +@core +bash-color-prompt +curl +dconf +dejavu-sans-mono-fonts +fedora-remix-logos +firefox +gdm +generic-logos +generic-release +generic-release-common +generic-release-notes +gnome-backgrounds.noarch +gnome-control-center +gnome-session-wayland-session +gnome-shell +gnome-terminal +gvfs-fuse +initial-setup +libusb +mozilla-ublock-origin.noarch +nano +nautilus +pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio +qemu-guest-agent +spice-vdagent +usbutils +wget + +%end diff --git a/dishes/virtual-desktop_rawhide.cfg b/dishes/virtual-desktop_rawhide.cfg index 92f1f62..b532c6a 100644 --- a/dishes/virtual-desktop_rawhide.cfg +++ b/dishes/virtual-desktop_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text @@ -131,7 +131,6 @@ generic-release-common generic-release-notes gnome-backgrounds.noarch gnome-control-center -gnome-initial-setup gnome-session-wayland-session gnome-shell gnome-terminal @@ -142,6 +141,9 @@ mozilla-ublock-origin.noarch nano nautilus pciutils +pipewire-alsa +pipewire-jack-audio-connection-kit +pipewire-pulseaudio qemu-guest-agent spice-vdagent usbutils diff --git a/dishes/virtual-server_43.cfg b/dishes/virtual-server_43.cfg index f0ba13e..1292cb0 100644 --- a/dishes/virtual-server_43.cfg +++ b/dishes/virtual-server_43.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/dishes/virtual-server_devel_43.cfg b/dishes/virtual-server_devel_43.cfg index fdc80bf..67760d2 100644 --- a/dishes/virtual-server_devel_43.cfg +++ b/dishes/virtual-server_devel_43.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/dishes/virtual-server_devel_rawhide.cfg b/dishes/virtual-server_devel_rawhide.cfg index f90487e..101895f 100644 --- a/dishes/virtual-server_devel_rawhide.cfg +++ b/dishes/virtual-server_devel_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/dishes/virtual-server_rawhide.cfg b/dishes/virtual-server_rawhide.cfg index 5516d3d..53ce797 100644 --- a/dishes/virtual-server_rawhide.cfg +++ b/dishes/virtual-server_rawhide.cfg @@ -1,4 +1,4 @@ -# Generated by pykickstart v3.62 +# Generated by pykickstart v3.66 #version=DEVEL # Use text mode install text diff --git a/ingredients/core-storage-encrypted.cfg b/ingredients/core-storage-encrypted.cfg new file mode 100644 index 0000000..11a4a9d --- /dev/null +++ b/ingredients/core-storage-encrypted.cfg @@ -0,0 +1,6 @@ +zerombr # Destroy all the contents of disks with invalid partition tables or other formatting unrecognizable to the installer +clearpart --all --initlabel # Erase all partitions and Initializes the disk label to the default for the target architecture + +part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label=efi # Creates a 512 MiB EFI system partition +part /boot --fstype="ext4" --size=2048 --label=boot # Creates a 2048 MiB ext4 boot partition +part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" --encrypted --passphrase= # Create a single encrypted root partition with the remaining space. \ No newline at end of file diff --git a/recipes/virtual-desktop_rawhide-encrypted.cfg b/recipes/virtual-desktop_rawhide-encrypted.cfg new file mode 100644 index 0000000..145f035 --- /dev/null +++ b/recipes/virtual-desktop_rawhide-encrypted.cfg @@ -0,0 +1,22 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# 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/virtual-desktop_rawhide.cfg b/recipes/virtual-desktop_rawhide.cfg index d7721ae..4c56a6f 100644 --- a/recipes/virtual-desktop_rawhide.cfg +++ b/recipes/virtual-desktop_rawhide.cfg @@ -17,7 +17,6 @@ %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/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/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