From a7f24fd4bb6574fcc27132e3df6c26063fb399e9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 16 Jul 2009 09:22:40 +0000 Subject: [PATCH] Trying to build a good rescue CD.. svn path=/nixos/branches/modular-nixos/; revision=16385 --- .../installer/cd-dvd/installation-cd-base.nix | 2 +- .../cd-dvd/installation-cd-rescue.nix | 39 +++++++++++++++++++ release.nix | 5 +++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 modules/installer/cd-dvd/installation-cd-rescue.nix diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix index dc84fa3e8cba..83fd1423ef1d 100644 --- a/modules/installer/cd-dvd/installation-cd-base.nix +++ b/modules/installer/cd-dvd/installation-cd-base.nix @@ -71,7 +71,7 @@ in [ options ./iso-image.nix ./memtest.nix - ../../../hardware/network/intel-3945abg.nix + ../../hardware/network/intel-3945abg.nix ]; # ISO naming. diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix new file mode 100644 index 000000000000..97965c06d5b4 --- /dev/null +++ b/modules/installer/cd-dvd/installation-cd-rescue.nix @@ -0,0 +1,39 @@ +# This module defines a small NixOS installation CD. It does not +# contain any graphical stuff. + +{config, pkgs, ...}: + +{ + require = [./installation-cd-base.nix]; + + installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"; + + # Don't include X libraries. + services.sshd.forwardX11 = false; + services.dbus.enable = false; # depends on libX11 + services.hal.enable = false; # depends on dbus + fonts.enableFontConfig = false; + fonts.enableCoreFonts = false; + + # Useful for rescue.. + environment.systemPackages = with pkgs; [ + utillinuxCurses ddrescue + pciutils sdparm hdparm hddtemp usbutils + btrfsProgs xfsProgs jfsUtils jfsrec + wpa_supplicant iproute + fuse ntfs3g smbfsFuse sshfsFuse + manpages irssi elinks mcabber mutt openssh lftp + openssl ncat socat + gnupg gnupg2 + patch which diffutils gcc binutils bc file + screen + bvi joe nvi + subversion16 monotone git darcs mercurial bazaar cvs + unrar unzip zip lzma cabextract cpio + lsof + ]; + + boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc2_old_i686; + + services.ttyBackgrounds.enable = false; +} diff --git a/release.nix b/release.nix index ca0a101d7969..69459a258954 100644 --- a/release.nix +++ b/release.nix @@ -83,6 +83,11 @@ let description = "minimal"; }; + iso_rescue = makeIso { + module = ./modules/installer/cd-dvd/installation-cd-rescue.nix; + description = "minimal"; + }; + iso_graphical = makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical.nix; description = "graphical";