diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index 836f8c45f89..07d63c76fe1 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -73,8 +73,8 @@ in { require = [ options - ./iso-image.nix ./memtest.nix + ./iso-image.nix ../../hardware/network/intel-3945abg.nix ../../hardware/network/rt73.nix ]; @@ -107,9 +107,40 @@ in pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs - pkgs.ntfsprogs # for resizing NTFS partitions pkgs.parted + pkgs.ddrescue + pkgs.ccrypt + pkgs.cryptsetup # needed for dm-crypt volumes + + # Some networking tools. pkgs.sshfsFuse + pkgs.socat + pkgs.screen + pkgs.wpa_supplicant # !!! should use the wpa module + + # Hardware-related tools. + pkgs.sdparm + pkgs.hdparm + pkgs.dmraid + + # Tools to create / manipulate filesystems. + pkgs.ntfsprogs # for resizing NTFS partitions + pkgs.btrfsProgs + pkgs.xfsprogs + pkgs.jfsutils + pkgs.jfsrec + + # Some compression/archiver tools. + pkgs.unrar + pkgs.unzip + pkgs.zip + pkgs.xz + pkgs.dar # disk archiver + + # Some editors. + pkgs.nvi + pkgs.bvi # binary editor + pkgs.joe ]; # The initrd has to contain any module that might be necessary for @@ -204,4 +235,10 @@ in # To speed up installation a little bit, include the complete stdenv # in the Nix store on the CD. isoImage.storeContents = [pkgs.stdenv]; + + # Allow sshd to be started manually through "start sshd". It should + # not be started by default on the installation CD because the + # default root password is empty. + services.sshd.enable = true; + jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; } diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix deleted file mode 100644 index 407fc6929db..00000000000 --- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix +++ /dev/null @@ -1,52 +0,0 @@ -# This module defines a small NixOS installation CD. It does not -# contain any graphical stuff. - -{config, pkgs, ...}: - -rec { - require = [./installation-cd-base.nix]; - - installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix"; - - # Allow sshd to be started manually through "start sshd". It should - # not be started by default on the installation CD because the - # default root password is empty. - services.sshd.enable = true; - jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; - - # Don't include X libraries. - environment.noXlibs = true; - - # Most users will download it anyway - security.sudo.enable = true; - - # Use Linux 2.6.31-zen (with aufs2). - boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen; - - # We need squashfs and aufs. Zen Linux Kernel contains kernel side. - boot.initrd.extraUtilsCommands = '' - cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin - cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin - mkdir -p $out/var/run/current-system/sw - ln -s /bin "$out/var/run/current-system/sw/sbin" - ''; - - boot.initrd.kernelModules = [ - "iso9660" "loop" "squashfs" - ]; - boot.initrd.allowMissing = true; - - environment.systemPackages = with pkgs; [ - klibc dmraid cryptsetup ccrypt - utillinuxCurses ddrescue testdisk - pciutils sdparm hdparm usbutils - btrfsProgs xfsprogs jfsutils jfsrec - wpa_supplicant iproute - manpages openssh openssl ncat socat - fuse ntfs3g gnupg gnupg2 - patch which diffutils gcc binutils bc file - gnused gnumake ncurses gnugrep findutils ed - screen bvi joe nvi dar xz lsof - unrar unzip zip lzma cpio - ]; -} diff --git a/modules/installer/cd-dvd/installation-cd-minimal.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix index dc7188d8dc2..ae520e64101 100644 --- a/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -8,12 +8,6 @@ installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; - # Allow sshd to be started manually through "start sshd". It should - # not be started by default on the installation CD because the - # default root password is empty. - services.sshd.enable = true; - jobs.sshd.startOn = pkgs.lib.mkOverride 50 {} ""; - # Don't include X libraries. services.sshd.forwardX11 = false; services.dbus.enable = false; # depends on libX11 diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix index 4fa7db9298b..7e624244048 100644 --- a/modules/installer/cd-dvd/iso-image.nix +++ b/modules/installer/cd-dvd/iso-image.nix @@ -137,6 +137,17 @@ in # and move that bit of code here. boot.isLiveCD = true; + # AUFS 2 support (currently unused). + /* + boot.initrd.extraUtilsCommands = + '' + cp ${config.boot.kernelPackages.aufs2Utils}/sbin/mount.aufs $out/bin + cp ${config.boot.kernelPackages.aufs2Utils}/sbin/umount.aufs $out/bin + mkdir -p $out/var/run/current-system/sw + ln -s /bin "$out/var/run/current-system/sw/sbin" + ''; + */ + # Closures to be copied to the Nix store on the CD, namely the init # script and the top-level system configuration directory. isoImage.storeContents = diff --git a/release.nix b/release.nix index 412e660857a..e12989fa57e 100644 --- a/release.nix +++ b/release.nix @@ -95,12 +95,6 @@ let description = "minimal"; }; - iso_minimal_fresh_kernel = makeIso { - module = ./modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix; - description = "minimal with 2.6.31-zen-branch"; - maintainers = ["raskin"]; - }; - /* iso_rescue = makeIso { module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;