dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/qemu-vm: consistently use efiSysMountPoint

Browse Source 
Remove the explicit creation of efiSysMountPoint. This is not needed in
the scripted or the systemd initrd.
This commit is contained in:
nikstur 2024-02-23 00:56:13 +01:00
parent b7b90d0455
commit cb5a876e82
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -393,7 +393,7 @@ in
The path (inside the VM) to the device containing the EFI System Partition (ESP). The path (inside the VM) to the device containing the EFI System Partition (ESP).
If you are *not* booting from a UEFI firmware, this value is, by If you are *not* booting from a UEFI firmware, this value is, by
default, `null`. The ESP is mounted under `/boot`. default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`.
''; '';
}; };
@ -1052,11 +1052,6 @@ in
user = "root"; user = "root";
group = "root"; group = "root";
}; };
"${config.boot.loader.efi.efiSysMountPoint}".d = {
mode = "0644";
user = "root";
group = "root";
};
}; };
# After booting, register the closure of the paths in # After booting, register the closure of the paths in
@ -1239,7 +1234,7 @@ in
options = [ "mode=0755" ]; options = [ "mode=0755" ];
neededForBoot = true; neededForBoot = true;
}; };
"/boot" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { "${config.boot.loader.efi.efiSysMountPoint}" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) {
device = cfg.bootPartition; device = cfg.bootPartition;
fsType = "vfat"; fsType = "vfat";
}; };