diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-10 12:04:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-10 15:28:55 +0200 |
commit | e5db79a8597873472c49d18061f6fd9e6f3e7437 (patch) | |
tree | abb49f56f734be801b972e1261ffc935ba280a86 /nixos/modules/installer/cd-dvd | |
parent | 0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92 (diff) | |
download | nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar.gz nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar.bz2 nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar.lz nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar.xz nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.tar.zst nixlib-e5db79a8597873472c49d18061f6fd9e6f3e7437.zip |
Move stuff to modules/profiles/installation-device.nix
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 15 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-minimal.nix | 5 |
2 files changed, 2 insertions, 18 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 5bd10823108c..bc3bd872d2a5 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -7,8 +7,7 @@ with lib; { imports = - [ ./channel.nix - ./iso-image.nix + [ ./iso-image.nix # Profiles of this basic installation CD. ../../profiles/all-hardware.nix @@ -21,18 +20,6 @@ with lib; isoImage.volumeID = substring 0 11 "NIXOS_ISO"; - # Make the installer more likely to succeed in low memory - # environments. The kernel's overcommit heustistics bite us - # fairly often, preventing processes such as nix-worker or - # download-using-manifests.pl from forking even if there is - # plenty of free memory. - boot.kernel.sysctl."vm.overcommit_memory" = "1"; - - # To speed up installation a little bit, include the complete stdenv - # in the Nix store on the CD. Archive::Cpio is needed for the - # initrd builder. nixos-artwork is needed for the GRUB background. - isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ]; - # EFI booting isoImage.makeEfiBootable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index f34e789e28c5..4641b8fcf9d1 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,14 +1,11 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, pkgs, lib, ... }: +{ config, lib, ... }: { imports = [ ./installation-cd-base.nix ../../profiles/minimal.nix ]; - - # Enable in installer, even if minimal profile disables it - services.nixosManual.enable = lib.mkOverride 999 true; } |