public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Option isoImage.storeContents to add extra paths to the Nix store on

Browse Source 
the CD.

svn path=/nixos/branches/modular-nixos/; revision=15906
This commit is contained in:
Eelco Dolstra 2009-06-09 13:27:50 +00:00
parent 45e6fe420c
commit 803d8b646f
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/installer/cd-dvd/installation-cd.nix
View File

@ -126,9 +126,18 @@ in
chown -R root.root /etc/nixos chown -R root.root /etc/nixos
''; '';
# Some more help text.
services.mingetty.helpLine = services.mingetty.helpLine =
'' ''
Log in as "root" with an empty password. Log in as "root" with an empty password.
''; '';
# To speed up installation a little bit, include the complete stdenv
# in the Nix store on the CD.
isoImage.storeContents =
[ { object = pkgs.stdenv;
symlink = "none";
}
];
} }

39
modules/installer/cd-dvd/iso-image.nix
View File

@ -15,8 +15,20 @@ let
} }
]; ];
description = '' description = ''
This option lists files that have to be copied to fixed This option lists files to be copied to fixed locations in the
locations in the generated ISO image. generated ISO image.
'';
};
isoImage.storeContents = pkgs.lib.mkOption {
example =
[ { object = pkgs.stdenv;
symlink = "/stdenv";
}
];
description = ''
This option lists additional derivations to be included in the
Nix store in the generated ISO image.
''; '';
}; };
@ -77,6 +89,17 @@ in
} }
]; ];
# Closures to be copied to the Nix store on the CD, namely the init
# script and the top-level system configuration directory.
isoImage.storeContents =
[ { object = config.system.build.bootStage2;
symlink = "/init";
}
{ object = config.system.build.system;
symlink = "/system";
}
];
# The Grub menu. # The Grub menu.
boot.extraGrubEntries = boot.extraGrubEntries =
'' ''
@ -101,18 +124,8 @@ in
volumeID = cdLabel; volumeID = cdLabel;
# Single files to be copied to fixed locations on the CD.
contents = config.isoImage.contents; contents = config.isoImage.contents;
storeContents = config.isoImage.storeContents;
# Closures to be copied to the Nix store on the CD.
storeContents =
[ { object = config.system.build.bootStage2;
symlink = "/init";
}
{ object = config.system.build.system;
symlink = "/system";
}
];
}; };
# After booting, register the contents of the Nix store on the CD in # After booting, register the contents of the Nix store on the CD in