movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/qemu-vm: useBootPartition -> useBIOSBoot

Browse source 
useBootPartition was ambiguous, this makes the option more like useEFIBoot

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
This commit is contained in:
John Titor 2025-05-26 13:35:23 +05:30 • committed by Masum Reza
parent c156a809e3
commit ad331efcaf
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/virtualisation/qemu-vm.nix
View file

@ -65,12 +65,12 @@ let
{ {
useEFIBoot, useEFIBoot,
useDefaultFilesystems, useDefaultFilesystems,
useBootPartition, useBIOSBoot,
}: }:
if useDefaultFilesystems then if useDefaultFilesystems then
if useEFIBoot then if useEFIBoot then
"efi" "efi"
else if useBootPartition then else if useBIOSBoot then
"legacy+boot" "legacy+boot"
else else
"legacy" "legacy"
@ -350,7 +350,7 @@ let
onlyNixStore = false; onlyNixStore = false;
label = rootFilesystemLabel; label = rootFilesystemLabel;
partitionTableType = selectPartitionTableLayout { partitionTableType = selectPartitionTableLayout {
inherit (cfg) useBootPartition useDefaultFilesystems useEFIBoot; inherit (cfg) useBIOSBoot useDefaultFilesystems useEFIBoot;
}; };
installBootLoader = cfg.installBootLoader; installBootLoader = cfg.installBootLoader;
touchEFIVars = cfg.useEFIBoot; touchEFIVars = cfg.useEFIBoot;
@ -448,13 +448,13 @@ in
default = default =
if cfg.useEFIBoot then if cfg.useEFIBoot then
"/dev/disk/by-label/${espFilesystemLabel}" "/dev/disk/by-label/${espFilesystemLabel}"
else if cfg.useBootPartition then else if cfg.useBIOSBoot then
"/dev/disk/by-label/BOOT" "/dev/disk/by-label/BOOT"
else else
null; null;
defaultText = literalExpression '' defaultText = literalExpression ''
if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}"
else if cfg.useBootPartition then "/dev/disk/by-label/BOOT" else if cfg.useBIOSBoot then "/dev/disk/by-label/BOOT"
else null''; else null'';
example = "/dev/disk/by-label/esp"; example = "/dev/disk/by-label/esp";
description = '' description = ''
@ -952,11 +952,11 @@ in
''; '';
}; };
virtualisation.useBootPartition = mkEnableOption null // { virtualisation.useBIOSBoot = mkEnableOption null // {
description = '' description = ''
If enabled for legacy MBR VMs, the VM image will have a separate boot If enabled for legacy MBR VMs, the VM image will have a separate boot
partition mounted at /boot. partition mounted at /boot.
useBootPartition is ignored if useEFIBoot == true. useBIOSBoot is ignored if useEFIBoot == true.
''; '';
}; };

2
nixos/tests/limine/bios.nix
View file

@ -14,7 +14,7 @@
{ ... }: { ... }:
{ {
virtualisation.useBootLoader = true; virtualisation.useBootLoader = true;
virtualisation.useBootPartition = true; virtualisation.useBIOSBoot = true;
boot.loader.limine.enable = true; boot.loader.limine.enable = true;
boot.loader.limine.efiSupport = false; boot.loader.limine.efiSupport = false;
boot.loader.timeout = 0; boot.loader.timeout = 0;