From f8ea7db7f0ff93dfd2d4d2eed06dc42348c9dc33 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Sat, 14 Feb 2026 17:43:29 +0100 Subject: [PATCH] remove unuseful dishes and update the rest --- dishes/desktop-hypervisor-amdcpu.cfg | 23 +- .../desktop-hypervisor-intelcpu-intelgpu.cfg | 23 +- dishes/desktop-hypervisor-intelcpu.cfg | 23 +- dishes/desktop-hypervisor.cfg | 23 +- dishes/desktop.cfg | 25 +- dishes/live-desktop-hypervisor.cfg | 19 +- dishes/live-desktop.cfg | 21 +- dishes/live-server-hypervisor.cfg | 3 +- dishes/live-server.cfg | 3 +- dishes/virtual-desktop-hypervisor_devel.cfg | 292 ------------------ ...-hypervisor.cfg => virtual-desktop_43.cfg} | 141 +-------- ...devel.cfg => virtual-desktop_43_devel.cfg} | 25 +- dishes/virtual-desktop_devel_rawhide.cfg | 186 +++++++++++ ...esktop.cfg => virtual-desktop_rawhide.cfg} | 23 +- dishes/virtual-server-hypervisor.cfg | 143 --------- dishes/virtual-server-hypervisor_devel.cfg | 143 --------- dishes/virtual-server_43.cfg | 127 ++++++++ ..._devel.cfg => virtual-server_devel_43.cfg} | 9 +- ...r.cfg => virtual-server_devel_rawhide.cfg} | 4 +- dishes/virtual-server_rawhide.cfg | 126 ++++++++ 20 files changed, 513 insertions(+), 869 deletions(-) delete mode 100644 dishes/virtual-desktop-hypervisor_devel.cfg rename dishes/{virtual-desktop-hypervisor.cfg => virtual-desktop_43.cfg} (52%) rename dishes/{virtual-desktop_devel.cfg => virtual-desktop_43_devel.cfg} (87%) create mode 100644 dishes/virtual-desktop_devel_rawhide.cfg rename dishes/{virtual-desktop.cfg => virtual-desktop_rawhide.cfg} (91%) delete mode 100644 dishes/virtual-server-hypervisor.cfg delete mode 100644 dishes/virtual-server-hypervisor_devel.cfg create mode 100644 dishes/virtual-server_43.cfg rename dishes/{virtual-server_devel.cfg => virtual-server_devel_43.cfg} (80%) rename dishes/{virtual-server.cfg => virtual-server_devel_rawhide.cfg} (92%) create mode 100644 dishes/virtual-server_rawhide.cfg diff --git a/dishes/desktop-hypervisor-amdcpu.cfg b/dishes/desktop-hypervisor-amdcpu.cfg index 0f064c3..4234c1f 100644 --- a/dishes/desktop-hypervisor-amdcpu.cfg +++ b/dishes/desktop-hypervisor-amdcpu.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -230,9 +231,10 @@ echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add s %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -245,7 +247,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -254,7 +255,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -262,11 +262,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -297,8 +293,6 @@ libvirt-daemon-qemu libvirt-dbus libvirt-nss man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -308,9 +302,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -334,8 +325,6 @@ vim-minimal virt-install virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg index a1ec05f..21a33ff 100644 --- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -240,9 +241,10 @@ echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specif %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -255,7 +257,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -264,7 +265,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -272,11 +272,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -307,8 +303,6 @@ libvirt-daemon-qemu libvirt-dbus libvirt-nss man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -318,9 +312,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -344,8 +335,6 @@ vim-minimal virt-install virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/desktop-hypervisor-intelcpu.cfg b/dishes/desktop-hypervisor-intelcpu.cfg index 04f36a5..067e6df 100644 --- a/dishes/desktop-hypervisor-intelcpu.cfg +++ b/dishes/desktop-hypervisor-intelcpu.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -230,9 +231,10 @@ echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -245,7 +247,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -254,7 +255,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -262,11 +262,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -297,8 +293,6 @@ libvirt-daemon-qemu libvirt-dbus libvirt-nss man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -308,9 +302,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -334,8 +325,6 @@ vim-minimal virt-install virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/desktop-hypervisor.cfg b/dishes/desktop-hypervisor.cfg index aed7812..d6c739b 100644 --- a/dishes/desktop-hypervisor.cfg +++ b/dishes/desktop-hypervisor.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -222,9 +223,10 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -237,7 +239,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -246,7 +247,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -254,11 +254,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -289,8 +285,6 @@ libvirt-daemon-qemu libvirt-dbus libvirt-nss man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -300,9 +294,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -326,8 +317,6 @@ vim-minimal virt-install virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/desktop.cfg b/dishes/desktop.cfg index 7925ca0..618164a 100644 --- a/dishes/desktop.cfg +++ b/dishes/desktop.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -128,10 +129,11 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end -%packages --exclude-weakdeps +%packages +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -144,7 +146,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -153,7 +154,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -161,11 +161,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -181,8 +177,6 @@ less libertas-firmware libusb man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -192,9 +186,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -215,8 +206,6 @@ usbutils util-linux vim-minimal wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg index b7b7b77..c2355ca 100644 --- a/dishes/live-desktop-hypervisor.cfg +++ b/dishes/live-desktop-hypervisor.cfg @@ -38,7 +38,8 @@ part / --size=8576 %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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -279,9 +280,10 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image %packages --exclude-weakdeps @anaconda-tools +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi aajohan-comfortaa-fonts alsa-sof-firmware amd-gpu-firmware @@ -295,7 +297,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -305,7 +306,6 @@ dracut-live e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -314,11 +314,7 @@ generic-release-common generic-release-notes glibc glibc-all-langpacks -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -352,8 +348,6 @@ libvirt-dbus libvirt-nss livesys-scripts man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -363,9 +357,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -389,8 +380,6 @@ vim-minimal virt-install virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/live-desktop.cfg b/dishes/live-desktop.cfg index 25f8ad5..aa9b7aa 100644 --- a/dishes/live-desktop.cfg +++ b/dishes/live-desktop.cfg @@ -38,7 +38,8 @@ part / --size=8576 %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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -184,11 +185,12 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end -%packages --exclude-weakdeps +%packages @anaconda-tools +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi aajohan-comfortaa-fonts alsa-sof-firmware amd-gpu-firmware @@ -202,7 +204,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -212,7 +213,6 @@ dracut-live e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -221,11 +221,7 @@ generic-release-common generic-release-notes glibc glibc-all-langpacks -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -244,8 +240,6 @@ libertas-firmware libusb livesys-scripts man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -255,9 +249,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -278,8 +269,6 @@ usbutils util-linux vim-minimal wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/live-server-hypervisor.cfg b/dishes/live-server-hypervisor.cfg index 77ccb66..63e723c 100644 --- a/dishes/live-server-hypervisor.cfg +++ b/dishes/live-server-hypervisor.cfg @@ -36,7 +36,8 @@ part / --size=8576 %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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end diff --git a/dishes/live-server.cfg b/dishes/live-server.cfg index cb6d085..d980f50 100644 --- a/dishes/live-server.cfg +++ b/dishes/live-server.cfg @@ -36,7 +36,8 @@ part / --size=8576 %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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end diff --git a/dishes/virtual-desktop-hypervisor_devel.cfg b/dishes/virtual-desktop-hypervisor_devel.cfg deleted file mode 100644 index 03c7f10..0000000 --- a/dishes/virtual-desktop-hypervisor_devel.cfg +++ /dev/null @@ -1,292 +0,0 @@ -# Generated by pykickstart v3.62 -#version=DEVEL -# Use text mode install -text -# Firewall configuration -firewall --enabled --service=ssh -# 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 --plaintext --allow-ssh 1234 -# SELinux configuration -selinux --disabled -# System services -services --enabled="NetworkManager,systemd-resolved,libvirtd" -# 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=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot -part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" - -%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 - -%post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome-virtual-machine-manager.log - -# Create a file to autostart virt-manager -cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF -[Desktop Entry] -Type=Application -Name=Virtual Machine Manager -Exec=virt-manager -EOF - -# Modify the default virt-manager behavior for misc. options -cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF - -# Modify the default virt-manager behavior for misc. options -[org.virt-manager.virt-manager] -xmleditor-enabled=true -manager-window-height=600 -manager-window-width=200 - -# Libvirt URIs listed in the manager window -[org.virt-manager.virt-manager.connections] -uris=['qemu:///system', 'qemu:///session'] -autoconnect=['qemu:///session'] - -# Show usage in the domain list -[org.virt-manager.virt-manager.vmlist-fields] -cpu-usage=false - -# Settings related to statistics -[org.virt-manager.virt-manager.stats] -update-interval=3 -enable-disk-poll=true -enable-memory-poll=true -enable-net-poll=true - -# Default behavior for the console -[org.virt-manager.virt-manager.console] -scaling=2 -resize-guest=1 -autoconnect=false - -# Do not show toolbar -[org.virt-manager.virt-manager.details] -show-toolbar=false - -# Modify default values for new VMs -[org.virt-manager.virt-manager.new-vm] -storage-format='raw' -cpu-default='host-model' -graphics-type='spice' - -# Modify the default virt-manager behavior for confirmation dialogues -[org.virt-manager.virt-manager.confirm] -forcepoweroff=false -removedev=false -unapplied-dev=false - -EOF - -glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ - -%end - -%post --nochroot --logfile=/mnt/sysimage/root/base-hypervisor.log - -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd -echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf -echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf - -mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso images. SELinux is already taking this one into account. - -# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory - -# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit -# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'. -# virsh pool-build isos # Build the pool -# virsh pool-start isos # Start it -# virsh pool-autostart isos # Set-it to autostart - -# fetch custom script and make it executable -# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/ -# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml -# virsh define linux.xml - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml -# virsh define windows.xml - -%end - -%packages --exclude-weakdeps -NetworkManager -NetworkManager-config-connectivity-fedora -NetworkManager-wifi -audit -basesystem -bash -coreutils -curl -dejavu-sans-mono-fonts -dhcp-client -dnf5 -dnf5-plugins -dracut -dracut-config-rescue -e2fsprogs -fedora-remix-logos -filesystem -firefox -firewalld -fwupd -generic-logos -generic-release -generic-release-common -generic-release-notes -glibc -gnome-backgrounds.noarch -gnome-control-center -gnome-shell -gnome-terminal -hostname -iproute -iputils -kbd -kernel -less -libusb -libvirt -libvirt-client -libvirt-client-qemu -libvirt-daemon -libvirt-daemon-common -libvirt-daemon-config-network -libvirt-daemon-driver-ch -libvirt-daemon-driver-interface -libvirt-daemon-driver-network -libvirt-daemon-driver-qemu -libvirt-daemon-kvm -libvirt-daemon-log -libvirt-daemon-qemu -libvirt-dbus -libvirt-nss -man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch -nano -ncurses -openssh-clients -openssh-server -parted -pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio -plymouth -policycoreutils -prefixdevname -procps-ng -qemu-guest-agent -qemu-kvm -rootfiles -rpm -selinux-policy-targeted -setup -shadow-utils -spice-vdagent -sssd-common -sssd-kcm -sudo -systemd -systemd-resolved -usbutils -util-linux -vim-minimal -virt-install -virt-manager -wget -wpa_supplicant -zram-generator-defaults --gnome-tour - -%end diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop_43.cfg similarity index 52% rename from dishes/virtual-desktop-hypervisor.cfg rename to dishes/virtual-desktop_43.cfg index 9e77a0f..47f4e49 100644 --- a/dishes/virtual-desktop-hypervisor.cfg +++ b/dishes/virtual-desktop_43.cfg @@ -14,17 +14,18 @@ lang en_US.UTF-8 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 +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64 #Root password rootpw --lock # SELinux configuration selinux --enforcing # System services -services --enabled="NetworkManager,systemd-resolved,libvirtd" +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" +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64" # X Window System configuration information xconfig --defaultdesktop=GNOME --startxonboot # System bootloader configuration @@ -34,14 +35,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -128,103 +130,11 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end -%post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome-virtual-machine-manager.log - -# Create a file to autostart virt-manager -cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF -[Desktop Entry] -Type=Application -Name=Virtual Machine Manager -Exec=virt-manager -EOF - -# Modify the default virt-manager behavior for misc. options -cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF - -# Modify the default virt-manager behavior for misc. options -[org.virt-manager.virt-manager] -xmleditor-enabled=true -manager-window-height=600 -manager-window-width=200 - -# Libvirt URIs listed in the manager window -[org.virt-manager.virt-manager.connections] -uris=['qemu:///system', 'qemu:///session'] -autoconnect=['qemu:///session'] - -# Show usage in the domain list -[org.virt-manager.virt-manager.vmlist-fields] -cpu-usage=false - -# Settings related to statistics -[org.virt-manager.virt-manager.stats] -update-interval=3 -enable-disk-poll=true -enable-memory-poll=true -enable-net-poll=true - -# Default behavior for the console -[org.virt-manager.virt-manager.console] -scaling=2 -resize-guest=1 -autoconnect=false - -# Do not show toolbar -[org.virt-manager.virt-manager.details] -show-toolbar=false - -# Modify default values for new VMs -[org.virt-manager.virt-manager.new-vm] -storage-format='raw' -cpu-default='host-model' -graphics-type='spice' - -# Modify the default virt-manager behavior for confirmation dialogues -[org.virt-manager.virt-manager.confirm] -forcepoweroff=false -removedev=false -unapplied-dev=false - -EOF - -glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ - -%end - -%post --nochroot --logfile=/mnt/sysimage/root/base-hypervisor.log - -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd -echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf -echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf - -mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso images. SELinux is already taking this one into account. - -# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory - -# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit -# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'. -# virsh pool-build isos # Build the pool -# virsh pool-start isos # Start it -# virsh pool-autostart isos # Set-it to autostart - -# fetch custom script and make it executable -# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/ -# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml -# virsh define linux.xml - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml -# virsh define windows.xml - -%end - %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -237,7 +147,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -246,7 +155,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -254,11 +162,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -273,24 +177,7 @@ kernel less libertas-firmware libusb -libvirt -libvirt-client -libvirt-client-qemu -libvirt-daemon -libvirt-daemon-common -libvirt-daemon-config-network -libvirt-daemon-driver-ch -libvirt-daemon-driver-interface -libvirt-daemon-driver-network -libvirt-daemon-driver-qemu -libvirt-daemon-kvm -libvirt-daemon-log -libvirt-daemon-qemu -libvirt-dbus -libvirt-nss man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -300,15 +187,11 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname procps-ng qemu-guest-agent -qemu-kvm realtek-firmware rootfiles rpm @@ -325,11 +208,7 @@ tiwilink-firmware usbutils util-linux vim-minimal -virt-install -virt-manager wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/virtual-desktop_devel.cfg b/dishes/virtual-desktop_43_devel.cfg similarity index 87% rename from dishes/virtual-desktop_devel.cfg rename to dishes/virtual-desktop_43_devel.cfg index a9fd783..568fc4c 100644 --- a/dishes/virtual-desktop_devel.cfg +++ b/dishes/virtual-desktop_43_devel.cfg @@ -12,7 +12,8 @@ lang en_US.UTF-8 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 +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64 # Root password rootpw --plaintext --allow-ssh 1234 # SELinux configuration @@ -22,7 +23,7 @@ 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" +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64" # X Window System configuration information xconfig --defaultdesktop=GNOME --startxonboot # System bootloader configuration @@ -32,8 +33,8 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome.log @@ -106,15 +107,15 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi audit basesystem bash coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -123,7 +124,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -131,10 +131,6 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center -gnome-shell -gnome-terminal hostname iproute iputils @@ -143,17 +139,12 @@ kernel less libusb man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch nano ncurses openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -174,8 +165,6 @@ usbutils util-linux vim-minimal wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/virtual-desktop_devel_rawhide.cfg b/dishes/virtual-desktop_devel_rawhide.cfg new file mode 100644 index 0000000..7d16e64 --- /dev/null +++ b/dishes/virtual-desktop_devel_rawhide.cfg @@ -0,0 +1,186 @@ +# Generated by pykickstart v3.62 +#version=DEVEL +# Use text mode install +text +# Firewall configuration +firewall --enabled --service=ssh +# 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 --plaintext --allow-ssh 1234 +# SELinux configuration +selinux --disabled +# 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 --mkfsoptions="-O encrypt,fast_commit" + +%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 + +%post --nochroot --logfile=/mnt/sysimage/root/base-initial-setup-gnome.log + +truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available + +## Append lines to existing vendor.conf file, so that options are skipped upon reboot +cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF +[pages] +skip=privacy +[goa] +providers=local-first! +EOF + +%end + +%packages --exclude-weakdeps +@base-graphical +@critical-path-gnome +NetworkManager +NetworkManager-config-connectivity-fedora +audit +basesystem +bash +coreutils +curl +dhcp-client +dnf5 +dnf5-plugins +dracut +dracut-config-rescue +e2fsprogs +fedora-remix-logos +filesystem +firewalld +fwupd +generic-logos +generic-release +generic-release-common +generic-release-notes +glibc +gnome-initial-setup +hostname +iproute +iputils +kbd +kernel +less +libusb +man-db +nano +ncurses +openssh-clients +openssh-server +parted +pciutils +plymouth +policycoreutils +prefixdevname +procps-ng +qemu-guest-agent +rootfiles +rpm +selinux-policy-targeted +setup +shadow-utils +spice-vdagent +sssd-common +sssd-kcm +sudo +systemd +systemd-resolved +usbutils +util-linux +vim-minimal +wget +zram-generator-defaults + +%end diff --git a/dishes/virtual-desktop.cfg b/dishes/virtual-desktop_rawhide.cfg similarity index 91% rename from dishes/virtual-desktop.cfg rename to dishes/virtual-desktop_rawhide.cfg index de15891..ce850b5 100644 --- a/dishes/virtual-desktop.cfg +++ b/dishes/virtual-desktop_rawhide.cfg @@ -34,14 +34,15 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --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 +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful %end @@ -129,9 +130,10 @@ glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/ %end %packages --exclude-weakdeps +@base-graphical +@critical-path-gnome NetworkManager NetworkManager-config-connectivity-fedora -NetworkManager-wifi alsa-sof-firmware amd-gpu-firmware atheros-firmware @@ -144,7 +146,6 @@ brcmfmac-firmware cirrus-audio-firmware coreutils curl -dejavu-sans-mono-fonts dhcp-client dnf5 dnf5-plugins @@ -153,7 +154,6 @@ dracut-config-rescue e2fsprogs fedora-remix-logos filesystem -firefox firewalld fwupd generic-logos @@ -161,11 +161,7 @@ generic-release generic-release-common generic-release-notes glibc -gnome-backgrounds.noarch -gnome-control-center gnome-initial-setup -gnome-shell -gnome-terminal hostname intel-audio-firmware intel-gpu-firmware @@ -181,8 +177,6 @@ less libertas-firmware libusb man-db -mesa-dri-drivers -mozilla-ublock-origin.noarch mt7xxx-firmware nano ncurses @@ -192,9 +186,6 @@ openssh-clients openssh-server parted pciutils -pipewire-alsa -pipewire-jack-audio-connection-kit -pipewire-pulseaudio plymouth policycoreutils prefixdevname @@ -217,8 +208,6 @@ usbutils util-linux vim-minimal wget -wpa_supplicant zram-generator-defaults --gnome-tour %end diff --git a/dishes/virtual-server-hypervisor.cfg b/dishes/virtual-server-hypervisor.cfg deleted file mode 100644 index 2137d92..0000000 --- a/dishes/virtual-server-hypervisor.cfg +++ /dev/null @@ -1,143 +0,0 @@ -# Generated by pykickstart v3.62 -#version=DEVEL -# Use text mode install -text -# Firewall configuration -firewall --enabled --service=ssh -# 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 --plaintext --allow-ssh 1234 -# SELinux configuration -selinux --disabled -# System services -services --enabled="NetworkManager,systemd-resolved,libvirtd" -# System timezone -timezone Europe/Zurich --utc -# Use network installation -url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64" -# 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=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot -part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" - -%post --nochroot --logfile=/mnt/sysimage/root/base-hypervisor.log - -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd -echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf -echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf - -mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso images. SELinux is already taking this one into account. - -# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory - -# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit -# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'. -# virsh pool-build isos # Build the pool -# virsh pool-start isos # Start it -# virsh pool-autostart isos # Set-it to autostart - -# fetch custom script and make it executable -# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/ -# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml -# virsh define linux.xml - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml -# virsh define windows.xml - -%end - -%packages --exclude-weakdeps -NetworkManager -NetworkManager-config-connectivity-fedora -audit -basesystem -bash -coreutils -curl -dhcp-client -dnf5 -dnf5-plugins -dracut -dracut-config-rescue -e2fsprogs -fedora-remix-logos -filesystem -firewalld -fwupd -generic-logos -generic-release -generic-release-common -generic-release-notes -glibc -hostname -iproute -iputils -kbd -kernel -less -libusb -libvirt -libvirt-client -libvirt-client-qemu -libvirt-daemon -libvirt-daemon-common -libvirt-daemon-config-network -libvirt-daemon-driver-ch -libvirt-daemon-driver-interface -libvirt-daemon-driver-network -libvirt-daemon-driver-qemu -libvirt-daemon-kvm -libvirt-daemon-log -libvirt-daemon-qemu -libvirt-dbus -libvirt-nss -man-db -nano -ncurses -openssh-clients -openssh-server -parted -pciutils -plymouth -policycoreutils -prefixdevname -procps-ng -qemu-guest-agent -qemu-kvm -rootfiles -rpm -selinux-policy-targeted -setup -shadow-utils -spice-vdagent -sssd-common -sssd-kcm -sudo -systemd -systemd-resolved -usbutils -util-linux -vim-minimal -virt-install -wget -zram-generator-defaults - -%end diff --git a/dishes/virtual-server-hypervisor_devel.cfg b/dishes/virtual-server-hypervisor_devel.cfg deleted file mode 100644 index 2137d92..0000000 --- a/dishes/virtual-server-hypervisor_devel.cfg +++ /dev/null @@ -1,143 +0,0 @@ -# Generated by pykickstart v3.62 -#version=DEVEL -# Use text mode install -text -# Firewall configuration -firewall --enabled --service=ssh -# 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 --plaintext --allow-ssh 1234 -# SELinux configuration -selinux --disabled -# System services -services --enabled="NetworkManager,systemd-resolved,libvirtd" -# System timezone -timezone Europe/Zurich --utc -# Use network installation -url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64" -# 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=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot -part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" - -%post --nochroot --logfile=/mnt/sysimage/root/base-hypervisor.log - -# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd -echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf -echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf -echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf -echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf - -mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso images. SELinux is already taking this one into account. - -# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory - -# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit -# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'. -# virsh pool-build isos # Build the pool -# virsh pool-start isos # Start it -# virsh pool-autostart isos # Set-it to autostart - -# fetch custom script and make it executable -# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/ -# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml -# virsh define linux.xml - -# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml -# virsh define windows.xml - -%end - -%packages --exclude-weakdeps -NetworkManager -NetworkManager-config-connectivity-fedora -audit -basesystem -bash -coreutils -curl -dhcp-client -dnf5 -dnf5-plugins -dracut -dracut-config-rescue -e2fsprogs -fedora-remix-logos -filesystem -firewalld -fwupd -generic-logos -generic-release -generic-release-common -generic-release-notes -glibc -hostname -iproute -iputils -kbd -kernel -less -libusb -libvirt -libvirt-client -libvirt-client-qemu -libvirt-daemon -libvirt-daemon-common -libvirt-daemon-config-network -libvirt-daemon-driver-ch -libvirt-daemon-driver-interface -libvirt-daemon-driver-network -libvirt-daemon-driver-qemu -libvirt-daemon-kvm -libvirt-daemon-log -libvirt-daemon-qemu -libvirt-dbus -libvirt-nss -man-db -nano -ncurses -openssh-clients -openssh-server -parted -pciutils -plymouth -policycoreutils -prefixdevname -procps-ng -qemu-guest-agent -qemu-kvm -rootfiles -rpm -selinux-policy-targeted -setup -shadow-utils -spice-vdagent -sssd-common -sssd-kcm -sudo -systemd -systemd-resolved -usbutils -util-linux -vim-minimal -virt-install -wget -zram-generator-defaults - -%end diff --git a/dishes/virtual-server_43.cfg b/dishes/virtual-server_43.cfg new file mode 100644 index 0000000..6cf6468 --- /dev/null +++ b/dishes/virtual-server_43.cfg @@ -0,0 +1,127 @@ +# Generated by pykickstart v3.62 +#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="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&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=fedora-43&arch=x86_64" +# 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 --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 + +%packages --exclude-weakdeps +NetworkManager +NetworkManager-config-connectivity-fedora +alsa-sof-firmware +amd-gpu-firmware +atheros-firmware +audit +b43-fwcutter +b43-openfwwf +basesystem +bash +brcmfmac-firmware +cirrus-audio-firmware +coreutils +curl +dhcp-client +dnf5 +dnf5-plugins +dracut +dracut-config-rescue +e2fsprogs +fedora-remix-logos +filesystem +firewalld +fwupd +generic-logos +generic-release +generic-release-common +generic-release-notes +glibc +hostname +initial-setup +intel-audio-firmware +intel-gpu-firmware +intel-vsc-firmware +iproute +iputils +iwlegacy-firmware +iwlwifi-dvm-firmware +iwlwifi-mvm-firmware +kbd +kernel +less +libertas-firmware +libusb +man-db +mt7xxx-firmware +nano +ncurses +nvidia-gpu-firmware +nxpwireless-firmware +openssh-clients +openssh-server +parted +pciutils +plymouth +policycoreutils +prefixdevname +procps-ng +qemu-guest-agent +realtek-firmware +rootfiles +rpm +selinux-policy-targeted +setup +shadow-utils +spice-vdagent +sssd-common +sssd-kcm +sudo +systemd +systemd-resolved +tiwilink-firmware +usbutils +util-linux +vim-minimal +wget +zram-generator-defaults + +%end diff --git a/dishes/virtual-server_devel.cfg b/dishes/virtual-server_devel_43.cfg similarity index 80% rename from dishes/virtual-server_devel.cfg rename to dishes/virtual-server_devel_43.cfg index 0757b46..c185d16 100644 --- a/dishes/virtual-server_devel.cfg +++ b/dishes/virtual-server_devel_43.cfg @@ -12,7 +12,8 @@ lang en_US.UTF-8 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 +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64 # Root password rootpw --plaintext --allow-ssh 1234 # SELinux configuration @@ -22,7 +23,7 @@ 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" +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64" # System bootloader configuration bootloader --location=mbr --timeout=1 # Clear the Master Boot Record @@ -30,8 +31,8 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --mkfsoptions="-O encrypt,fast_commit" %packages --exclude-weakdeps diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server_devel_rawhide.cfg similarity index 92% rename from dishes/virtual-server.cfg rename to dishes/virtual-server_devel_rawhide.cfg index 0757b46..2350df7 100644 --- a/dishes/virtual-server.cfg +++ b/dishes/virtual-server_devel_rawhide.cfg @@ -30,8 +30,8 @@ zerombr # Partition clearing information clearpart --all --initlabel # Disk partitioning information -part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi -part /boot --fstype="ext4" --size=512 --label=boot +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 --mkfsoptions="-O encrypt,fast_commit" %packages --exclude-weakdeps diff --git a/dishes/virtual-server_rawhide.cfg b/dishes/virtual-server_rawhide.cfg new file mode 100644 index 0000000..8b81ad8 --- /dev/null +++ b/dishes/virtual-server_rawhide.cfg @@ -0,0 +1,126 @@ +# Generated by pykickstart v3.62 +#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" +# 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 --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 + +%packages --exclude-weakdeps +NetworkManager +NetworkManager-config-connectivity-fedora +alsa-sof-firmware +amd-gpu-firmware +atheros-firmware +audit +b43-fwcutter +b43-openfwwf +basesystem +bash +brcmfmac-firmware +cirrus-audio-firmware +coreutils +curl +dhcp-client +dnf5 +dnf5-plugins +dracut +dracut-config-rescue +e2fsprogs +fedora-remix-logos +filesystem +firewalld +fwupd +generic-logos +generic-release +generic-release-common +generic-release-notes +glibc +hostname +initial-setup +intel-audio-firmware +intel-gpu-firmware +intel-vsc-firmware +iproute +iputils +iwlegacy-firmware +iwlwifi-dvm-firmware +iwlwifi-mvm-firmware +kbd +kernel +less +libertas-firmware +libusb +man-db +mt7xxx-firmware +nano +ncurses +nvidia-gpu-firmware +nxpwireless-firmware +openssh-clients +openssh-server +parted +pciutils +plymouth +policycoreutils +prefixdevname +procps-ng +qemu-guest-agent +realtek-firmware +rootfiles +rpm +selinux-policy-targeted +setup +shadow-utils +spice-vdagent +sssd-common +sssd-kcm +sudo +systemd +systemd-resolved +tiwilink-firmware +usbutils +util-linux +vim-minimal +wget +zram-generator-defaults + +%end