Commit cb5a876e authored by nikstur's avatar nikstur
Browse files

nixos/qemu-vm: consistently use efiSysMountPoint 

Remove the explicit creation of efiSysMountPoint. This is not needed in
the scripted or the systemd initrd.
parent b7b90d04

nixos/modules/virtualisation/qemu-vm.nix

+2 −7
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ in 
            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

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

        group = "root";

      };

      "${config.boot.loader.efi.efiSysMountPoint}".d = {

        mode = "0644";

        user = "root";

        group = "root";

      };

    };



    # After booting, register the closure of the paths in
@@ -1239,7 +1234,7 @@ in 
          options = [ "mode=0755" ];

          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;

          fsType = "vfat";

        };