Catching up with rescue-cd.nix

svn path=/nixos/trunk/; revision=10391
This commit is contained in:
Michael Raskin 2008-01-29 22:37:24 +00:00
parent 2da50038e4
commit 76a6498196

View File

@ -33,6 +33,7 @@ let
{configuration=configuration; suffix=""} is always prepended. {configuration=configuration; suffix=""} is always prepended.
*/ */
configList = arg "configList" (configuration : []); configList = arg "configList" (configuration : []);
aufs = arg "aufs" true;
in in
let let
@ -104,17 +105,22 @@ rec {
configuration = let preConfiguration ={ configuration = let preConfiguration ={
boot = { boot = {
isLiveCD = true;
autoDetectRootDevice = true; autoDetectRootDevice = true;
readOnlyRoot = true;
# The label used to identify the installation CD. # The label used to identify the installation CD.
rootLabel = "NIXOS"; rootLabel = "NIXOS";
extraTTYs = [] ++ (lib.optional manualEnabled 7) ++ extraTTYs = [] ++ (lib.optional manualEnabled 7) ++
(lib.optional rogueEnabled 8); (lib.optional rogueEnabled 8);
inherit kernel; inherit kernel;
initrd = { initrd = {
extraKernelModules = extraInitrdKernelModules; extraKernelModules = extraInitrdKernelModules
++ (if aufs then ["aufs"] else [])
;
}; };
kernelModules = bootKernelModules; kernelModules = bootKernelModules;
extraModulePackages = []
++(if aufs then [pkgs.aufs] else [])
;
}; };
services = { services = {