diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-05 19:35:50 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-05 19:35:50 -0700 |
| commit | b35da0edee1d1e035d1b1b68827c5d632e1652b7 (patch) | |
| tree | 4e604febdc9def2324c34dfef3dab592f0be947d /nixos/modules | |
| parent | fbfdc139d68ec27938a41d6957ce1d5e672310e4 (diff) | |
| parent | 4b836fb680116ad5fa85ea2bb43ffeff3be4ec53 (diff) | |
| download | nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar.gz nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar.bz2 nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar.lz nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar.xz nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.tar.zst nixlib-b35da0edee1d1e035d1b1b68827c5d632e1652b7.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 0128fa9f33dd..c9abff2ecfc0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -216,7 +216,7 @@ in # !!! Hack - attributes expected by other modules. system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 pkgs.syslinux ]; + environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the |