diff options
author | Shea Levy <shea@shealevy.com> | 2013-11-01 11:29:36 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-11-01 11:29:36 -0400 |
commit | cd9786eed27f3ef5535605c483829fdf914c80a1 (patch) | |
tree | 4b0070e7167522d8e88fcd60a6fb32fc75d6507a /nixos | |
parent | fc91ec48a8c6a0eba7c11ac6710d7e664f51b53c (diff) | |
download | nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar.gz nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar.bz2 nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar.lz nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar.xz nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.tar.zst nixlib-cd9786eed27f3ef5535605c483829fdf914c80a1.zip |
Fold efi booting into the default livecd
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 6 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-efi.nix | 14 | ||||
-rw-r--r-- | nixos/release.nix | 9 | ||||
-rw-r--r-- | nixos/tests/efi-installer.nix | 2 |
4 files changed, 7 insertions, 24 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 999871ab074f..1aba67dcd9e9 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -32,6 +32,12 @@ with pkgs.lib; # in the Nix store on the CD. isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ]; + # EFI booting + isoImage.makeEfiBootable = true; + # Add Memtest86+ to the CD. boot.loader.grub.memtest86 = true; + + # Get a console as soon as the initrd loads fbcon on EFI boot + boot.initrd.kernelModules = [ "fbcon" ]; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix deleted file mode 100644 index 4aa788feeae5..000000000000 --- a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, pkgs, ... }: - -{ - # Move into base image once using 3.10 or later - - require = [ ./installation-cd-minimal.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_3_10; - - # Get a console as soon as the initrd loads fbcon on EFI boot - boot.initrd.kernelModules = [ "fbcon" ]; - - isoImage.makeEfiBootable = true; -} diff --git a/nixos/release.nix b/nixos/release.nix index 1ffb334d90a4..120b1289bd06 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -143,15 +143,6 @@ in rec { inherit system; }); - # A variant with efi booting support. Once cd-minimal has a newer kernel, - # this should be enabled by default. - iso_efi = forAllSystems (system: makeIso { - module = ./modules/installer/cd-dvd/installation-cd-efi.nix; - type = "efi"; - maintainers = [ "shlevy" ]; - inherit system; - }); - # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). ova = forAllSystems (system: diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix index 8a05dbf2a610..63aa0289ffbe 100644 --- a/nixos/tests/efi-installer.nix +++ b/nixos/tests/efi-installer.nix @@ -12,7 +12,7 @@ let (import ../lib/eval-config.nix { inherit system; modules = - [ ../modules/installer/cd-dvd/installation-cd-efi.nix + [ ../modules/installer/cd-dvd/installation-cd-minimal.nix ../modules/testing/test-instrumentation.nix { key = "serial"; |