reverting back to GRUB

dishes/desktop-hypervisor-amdcpu.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/desktop-hypervisor-intelcpu-intelgpu.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/desktop-hypervisor-intelcpu.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/desktop-hypervisor.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/desktop.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

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

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

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

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

dishes/virtual-desktop-hypervisor.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/virtual-desktop.cfg

@@ -29,7 +29,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/virtual-nano.cfg

@@ -27,7 +27,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/virtual-server-hypervisor.cfg

@@ -27,7 +27,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

dishes/virtual-server.cfg

@@ -27,7 +27,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 --sdboot
+bootloader --location=mbr --timeout=1
 # Clear the Master Boot Record
 zerombr
 # Partition clearing information

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-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
 %include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux
 %include ../ingredients/core-services.cfg # Required systemd services

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-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

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-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

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

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

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 #  # Set bootloader to systemd-boot
+%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

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 # Set bootloader to systemd-boot
+%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

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 # Set bootloader to systemd-boot
+%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

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 # Set bootloader to systemd-boot
+%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

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

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

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

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

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

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/ \