From 18723da1863a02509e484ffa44b19182f8e227fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 27 Jan 2026 20:26:12 +0000 Subject: [PATCH] Revert "qemu-system-x86_64 -enable-kvm -cpu host -m 1024 -serial mon:stdio -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -device e1000,netdev=net0 -boot order=n" This reverts commit e8408c502ba8892c29692fb99da625a30f9d68bd. --- hosts/mtworx/configuration.nix | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix index 33d20d2..5fc4d36 100644 --- a/hosts/mtworx/configuration.nix +++ b/hosts/mtworx/configuration.nix @@ -31,21 +31,15 @@ let shell ''; - # Custom iPXE with embedded menu (UEFI) - customIpxeEfi = pkgs.ipxe.override { - embedScript = ipxeMenu; - }; - - # Custom iPXE with embedded menu (BIOS) - customIpxeBios = pkgs.ipxe.override { + # Custom iPXE with embedded menu + customIpxe = pkgs.ipxe.override { embedScript = ipxeMenu; }; # TFTP root directory with all boot files tftp-root = pkgs.runCommand "tftp-root" { } '' mkdir -p $out/mrescue - cp ${customIpxeEfi}/ipxe.efi $out/boot.efi - cp ${customIpxeBios}/undionly.kpxe $out/boot.kpxe + cp ${customIpxe}/ipxe.efi $out/boot.efi cp ${pkgs.mrescue}/kernel $out/mrescue/kernel cp ${pkgs.mrescue}/initrd $out/mrescue/initrd cp ${pkgs.netbootxyz-efi} $out/netboot.xyz.efi @@ -232,23 +226,7 @@ in dhcp-option = "66,\"0.0.0.0\""; enable-tftp = true; tftp-root = "${tftp-root}"; - - # Detect client architecture and serve appropriate bootloader - # DHCP option 93 = Client System Architecture Type - dhcp-match = [ - "set:efi-x86_64,option:client-arch,7" # EFI BC (x86-64) - "set:efi-x86_64,option:client-arch,9" # EFI x86-64 - "set:efi-x86,option:client-arch,6" # EFI IA32 - "set:bios,option:client-arch,0" # BIOS x86 - ]; - - # Serve appropriate boot file based on architecture - dhcp-boot = [ - "tag:efi-x86_64,boot.efi" # UEFI x86-64 clients - "tag:efi-x86,boot.efi" # UEFI IA32 clients - "tag:bios,boot.kpxe" # BIOS clients - "boot.efi" # Default to UEFI if undetected - ]; + dhcp-boot = "boot.efi"; }; }; };