update comment to match reality

reverting back to GRUB
moving to no-secure-boot, and more generally a simpler virtual machine definition
2025-10-16 12:08:39 +02:00 · 2025-10-15 14:47:02 +02:00 · 2025-10-15 14:46:40 +02:00 · 2025-10-10 12:58:26 +02:00 · 2025-10-10 12:58:09 +02:00
31 changed files with 44 additions and 41 deletions
--- a/dishes/desktop-hypervisor-amdcpu.cfg
+++ b/dishes/desktop-hypervisor-amdcpu.cfg
@@ -35,7 +35,7 @@ zerombr
 # Partition clearing information
 clearpart --all --initlabel
 # Disk partitioning information
-part /boot/efi --fstype="efi" --size=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -35,7 +35,7 @@ zerombr
 # Partition clearing information
 clearpart --all --initlabel
 # Disk partitioning information
-part /boot/efi --fstype="efi" --size=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/desktop-hypervisor-intelcpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu.cfg
@@ -35,7 +35,7 @@ zerombr
 # Partition clearing information
 clearpart --all --initlabel
 # Disk partitioning information
-part /boot/efi --fstype="efi" --size=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/desktop-hypervisor.cfg
+++ b/dishes/desktop-hypervisor.cfg
@@ -29,13 +29,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/desktop.cfg
+++ b/dishes/desktop.cfg
@@ -29,13 +29,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- 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=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
--- a/dishes/live-desktop.cfg
+++ b/dishes/live-desktop.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=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
--- 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=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
--- a/dishes/live-server.cfg
+++ b/dishes/live-server.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=none --timeout=1 --sdboot
+bootloader --location=none --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information
--- a/dishes/virtual-desktop-hypervisor.cfg
+++ b/dishes/virtual-desktop-hypervisor.cfg
@@ -29,13 +29,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/virtual-desktop.cfg
+++ b/dishes/virtual-desktop.cfg
@@ -29,13 +29,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/virtual-nano.cfg
+++ b/dishes/virtual-nano.cfg
@@ -27,13 +27,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/virtual-server-hypervisor.cfg
+++ b/dishes/virtual-server-hypervisor.cfg
@@ -27,13 +27,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/dishes/virtual-server.cfg
+++ b/dishes/virtual-server.cfg
@@ -27,13 +27,13 @@ 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 --sdboot
+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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi
+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

--- a/ingredients/core-bootloader-systemd-boot.cfg
+++ b/ingredients/core-bootloader-systemd-boot.cfg
@@ -1 +1 @@
-bootloader --sdboot --timeout=1 # Use systemd-boot and set a timeout to 1
+bootloader --sdboot --location=mbr --timeout=1 # Use systemd-boot and set a timeout to 1
--- a/ingredients/core-storage.cfg
+++ b/ingredients/core-storage.cfg
@@ -1,6 +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=1024 --fsoptions="umask=0077,shortname=winnt" --label=efi # Creates an 1 GB EFI system partition
+part /boot/efi --fstype="efi" --size=2048 --fsoptions="umask=0077,shortname=winnt" --label=efi # Creates a 2 GB EFI system partition
 part /boot --fstype="ext4" --size=512 --label=boot # Creates a 512 MiB ext4 boot partition
 part / --fstype="ext4" --grow --label=root # Create a single root partition with the remaining space
--- a/recipes/desktop-hypervisor-amdcpu.cfg
+++ b/recipes/desktop-hypervisor-amdcpu.cfg
@@ -9,7 +9,7 @@

 %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 GNU GRUB
+%include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB
 %include ../ingredients/core-locale.cfg # System locale
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -10,7 +10,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/desktop-hypervisor-intelcpu.cfg
+++ b/recipes/desktop-hypervisor-intelcpu.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-grub.cfg # GNU GRUB
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/desktop-hypervisor.cfg
+++ b/recipes/desktop-hypervisor.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/desktop.cfg
+++ b/recipes/desktop.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/live-desktop-hypervisor.cfg
+++ b/recipes/live-desktop-hypervisor.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # systemd bootloader
+%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-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/live-desktop.cfg
+++ b/recipes/live-desktop.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # systemd bootloader
+%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-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/live-server-hypervisor.cfg
+++ b/recipes/live-server-hypervisor.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # systemd bootloader
+%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-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/live-server.cfg
+++ b/recipes/live-server.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/live-core.cfg # For live systems only
 %include ../ingredients/live-core-storage.cfg # For live systems only
-%include ../ingredients/live-core-bootloader-systemd-boot.cfg # systemd bootloader
+%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-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/virtual-desktop-hypervisor.cfg
+++ b/recipes/virtual-desktop-hypervisor.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/virtual-desktop.cfg
+++ b/recipes/virtual-desktop.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/virtual-nano.cfg
+++ b/recipes/virtual-nano.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/virtual-server-hypervisor.cfg
+++ b/recipes/virtual-server-hypervisor.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/recipes/virtual-server.cfg
+++ b/recipes/virtual-server.cfg
@@ -9,7 +9,7 @@

 %include ../ingredients/core.cfg # Text mode
 %include ../ingredients/core-storage.cfg # ext4-based storage configuration
-%include ../ingredients/core-bootloader-systemd-boot.cfg # Set bootloader to systemd-boot
+%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 # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services
--- a/scripts/deploy-distro.sh
+++ b/scripts/deploy-distro.sh
@@ -106,16 +106,17 @@ virt-install \
    --arch x86_64 \
    --machine q35 \
    --name "$vm_name" \
-    --boot uefi \
-    --cpu host-model,topology.sockets=1,topology.cores=2,topology.threads=2 \
-    --vcpus 4 \
+    --boot uefi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no \
+    --cpu host-model,topology.sockets=1,topology.cores=1,topology.threads=1 \
+    --vcpus 1 \
+    --cpu host-passthrough,cache.mode=passthrough \
    --memory "$memory_size" \
    --video virtio \
    --graphics spice,listen=0.0.0.0 \
    --channel unix,target.type=virtio,target.name=org.qemu.guest_agent.0 \
    --autoconsole none \
    --console pty,target.type=virtio \
-    --sound virtio \
+    --sound none \
    --network type="$network_type",model=virtio \
    --controller type=virtio-serial \
    --controller type=usb,model=none \
@@ -123,7 +124,9 @@ virt-install \
    --input type=keyboard,bus=virtio \
    --input type=mouse,bus=virtio \
    --rng /dev/urandom,model=virtio \
+    --tpm none \
    --iommu model=virtio \
+    --watchdog none \
    --memballoon none \
    --disk path="${disk_path}/${vm_name}.img",format=raw,bus=virtio,cache=writeback,size="$disk_size" \
    --location=https://download.fedoraproject.org/pub/fedora/linux/releases/42/Everything/x86_64/os/ \
Author	SHA1	Message	Date
Lukas Greve	7c3571f8e6	update comment to match reality	2025-10-16 12:08:39 +02:00
Lukas Greve	7ffc71043d	reverting back to GRUB	2025-10-15 14:47:02 +02:00
Lukas Greve	a8dcf4011c	moving to no-secure-boot, and more generally a simpler virtual machine definition	2025-10-15 14:46:40 +02:00
Lukas Greve	28b3e927a6	fix comment	2025-10-10 12:58:26 +02:00
Lukas Greve	06caf5b3c7	increase size of efi partition and explicitly list mbr for the location of the bootloader	2025-10-10 12:58:09 +02:00