From 0a7298b95db13bd919a73028b29803ff5c945188 Mon Sep 17 00:00:00 2001 From: luz Date: Sun, 4 May 2025 11:06:23 -0500 Subject: [PATCH] updated recipes --- dishes/live-desktop-hypervisor.cfg | 35 ++++++++++++++---------------- dishes/live-desktop.cfg | 10 ++++++++- dishes/live-server-hypervisor.cfg | 28 +++++++++++++++++++++++- dishes/live-server.cfg | 17 ++++++++++++++- 4 files changed, 68 insertions(+), 22 deletions(-) diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg index 3991d6a..10a3d3e 100644 --- a/dishes/live-desktop-hypervisor.cfg +++ b/dishes/live-desktop-hypervisor.cfg @@ -27,7 +27,7 @@ url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$rele # X Window System configuration information xconfig --defaultdesktop=GNOME --startxonboot # System bootloader configuration -bootloader --location=mbr --timeout=1 +bootloader --location=none --timeout=1 # Clear the Master Boot Record zerombr # Partition clearing information @@ -38,6 +38,14 @@ 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 +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful + +%end + +%post --logfile=/mnt/sysimage/root/post.log + # Enable livesys services systemctl enable livesys.service systemctl enable livesys-late.service @@ -88,6 +96,13 @@ touch /etc/machine-id %end +%post --logfile=/mnt/sysimage/root/post-live-session.log + +# set livesys session type +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys + +%end + %post --nochroot --logfile=/mnt/sysimage/opt/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 @@ -264,24 +279,6 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image %end -%post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor-intelcpu.log - -sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB. - -echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested virtualization on Intel CPUs - -%end - -%post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor-intelgpu.log - -sed -i 's/\(vfio-pci\)/\1 i915.enable_gvt=1/i' /mnt/sysimage/etc/default/grub # Load kernel modules in grub. - -# Load extra kernel modules to enable vfio-mdev on selected hardware -echo "kvmgt" > /mnt/sysimage/etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) -echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) - -%end - %packages --exclude-weakdeps @anaconda-tools NetworkManager diff --git a/dishes/live-desktop.cfg b/dishes/live-desktop.cfg index 7c16848..e870807 100644 --- a/dishes/live-desktop.cfg +++ b/dishes/live-desktop.cfg @@ -38,6 +38,14 @@ 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 +grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful + +%end + +%post --logfile=/mnt/sysimage/root/post.log + # Enable livesys services systemctl enable livesys.service systemctl enable livesys-late.service @@ -88,7 +96,7 @@ touch /etc/machine-id %end -%post +%post --logfile=/mnt/sysimage/root/post-live-session.log # set livesys session type sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys diff --git a/dishes/live-server-hypervisor.cfg b/dishes/live-server-hypervisor.cfg index 6f377da..acbf47a 100644 --- a/dishes/live-server-hypervisor.cfg +++ b/dishes/live-server-hypervisor.cfg @@ -25,7 +25,7 @@ timezone Europe/Paris --utc # Use network installation url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch" # System bootloader configuration -bootloader --location=mbr --timeout=1 +bootloader --location=none --timeout=1 # Clear the Master Boot Record zerombr # Partition clearing information @@ -94,6 +94,13 @@ touch /etc/machine-id %end +%post --logfile=/mnt/sysimage/root/post-live-session.log + +# set livesys session type +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys + +%end + %post --nochroot --logfile=/mnt/sysimage/opt/base-hypervisor.log # Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd @@ -129,9 +136,16 @@ mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso image NetworkManager NetworkManager-config-connectivity-fedora aajohan-comfortaa-fonts +alsa-sof-firmware +amd-gpu-firmware +atheros-firmware audit +b43-fwcutter +b43-openfwwf basesystem bash +brcmfmac-firmware +cirrus-audio-firmware coreutils curl dhcp-client @@ -154,13 +168,20 @@ glibc-all-langpacks guestfs-tools hostname initial-setup +intel-audio-firmware +intel-gpu-firmware +intel-vsc-firmware iproute iputils +iwlegacy-firmware +iwlwifi-dvm-firmware +iwlwifi-mvm-firmware kbd kernel kernel-modules kernel-modules-extra less +libertas-firmware libguestfs-tools libusb1 libvirt @@ -168,8 +189,11 @@ libvirt-daemon-config-network libvirt-daemon-kvm livesys-scripts man-db +mt7xxx-firmware nano ncurses +nvidia-gpu-firmware +nxpwireless-firmware openssh-clients openssh-server parted @@ -180,6 +204,7 @@ prefixdevname procps-ng python3-libguestfs qemu-kvm +realtek-firmware rootfiles rpm selinux-policy-targeted @@ -190,6 +215,7 @@ sssd-kcm sudo systemd systemd-resolved +tiwilink-firmware usbutils util-linux vim-minimal diff --git a/dishes/live-server.cfg b/dishes/live-server.cfg index 3fddfa6..721996c 100644 --- a/dishes/live-server.cfg +++ b/dishes/live-server.cfg @@ -94,7 +94,7 @@ touch /etc/machine-id %end -%post +%post --logfile=/mnt/sysimage/root/post-live-session.log # set livesys session type sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys @@ -103,6 +103,8 @@ sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys %packages --exclude-weakdeps @anaconda-tools +NetworkManager +NetworkManager-config-connectivity-fedora aajohan-comfortaa-fonts audit basesystem @@ -111,11 +113,15 @@ coreutils curl dhcp-client dnf5 +dnf5-plugins dracut +dracut-config-rescue dracut-live e2fsprogs fedora-remix-logos filesystem +firewalld +fwupd generic-logos generic-release generic-release-common @@ -131,13 +137,18 @@ kernel kernel-modules kernel-modules-extra less +libusb1 livesys-scripts man-db +nano ncurses openssh-clients openssh-server parted +pciutils +plymouth policycoreutils +prefixdevname procps-ng rootfiles rpm @@ -148,8 +159,12 @@ sssd-common sssd-kcm sudo systemd +systemd-resolved +usbutils util-linux vim-minimal +wget2 +zram-generator-defaults -fedora-logos -fedora-release -fedora-release-common