Author: shlevy
Date: Fri Mar 16 06:08:55 2012
New Revision: 33141
URL: https://nixos.org/websvn/nix/?rev=33141&sc=1
Log:
efiBootStub: Properly handle the removableMediaImage path on different
architectures
Modified:
nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix
Modified: nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix
==============================================================================
--- nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix Fri Mar
16 05:37:24 2012 (r33140)
+++ nixos/trunk/modules/installer/efi-boot-stub/efi-boot-stub.nix Fri Mar
16 06:08:55 2012 (r33141)
@@ -87,12 +87,12 @@
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.glibc] ++
(pkgs.stdenv.lib.optionals config.boot.loader.efiBootStub.runEfibootmgr
[pkgs.efibootmgr pkgs.module_init_tools]);
inherit (config.boot.loader.efiBootStub) efiSysMountPoint runEfibootmgr
installStartupNsh efiDisk efiPartition installRemovableMediaImage;
kernelFile = platform.kernelTarget;
- } // pkgs.stdenv.lib.optionalAttrs
config.boot.loader.efiBootStub.installRemovableMediaImage {
- removableMediaImage = "${pkgs.NixosBootPkg}/*/NixosBoot.efi";
+ } // pkgs.stdenv.lib.optionalAttrs
config.boot.loader.efiBootStub.installRemovableMediaImage rec {
+ removableMediaImage = "${pkgs.NixosBootPkg}/${targetArch}/NixosBoot.efi";
targetArch = if pkgs.stdenv.isi686 then
"IA32"
else if pkgs.stdenv.isx86_64 then
- "x64"
+ "X64"
else
throw "Unsupported architecture";
});
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
