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

* Merged some trunk commits.

Browse Source 
svn path=/nixos/branches/modular-nixos/; revision=15860
This commit is contained in:
Eelco Dolstra 2009-06-05 11:18:58 +00:00
parent 021c65da98
commit aa3ce13270
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installer/cd-dvd/rescue-cd.nix
View File

@ -5,7 +5,6 @@
else "nixos-${builtins.readFile ../../VERSION}" else "nixos-${builtins.readFile ../../VERSION}"
, compressImage ? false , compressImage ? false
, nixpkgs ? ../../../nixpkgs , nixpkgs ? ../../../nixpkgs
, services ? ../../../services
# This option allows easy building of Rescue CD with # This option allows easy building of Rescue CD with
# modified package set / driver set / anything. # modified package set / driver set / anything.
# For easier maitenance, let overrider know the current # For easier maitenance, let overrider know the current
@ -26,7 +25,7 @@ rec {
boot = { boot = {
isLiveCD = true; isLiveCD = true;
extraTTYs = [7 8]; # manual, rogue
extraModulePackages = [system.kernelPackages.aufs]; extraModulePackages = [system.kernelPackages.aufs];
kernelPackages = pkgs.kernelPackages_2_6_28; kernelPackages = pkgs.kernelPackages_2_6_28;
@ -129,8 +128,6 @@ rec {
tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
mkdir -p /etc/nixos/nixpkgs mkdir -p /etc/nixos/nixpkgs
tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs tar xjf /install/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
mkdir -p /etc/nixos/services
tar xjf /install/services.tar.bz2 -C /etc/nixos/services
chown -R root.root /etc/nixos chown -R root.root /etc/nixos
end script end script
"; ";
@ -152,7 +149,7 @@ rec {
}; };
installer = { installer = {
nixpkgsURL = http://nixos.org/releases/nixpkgs/unstable; nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
}; };
security = { security = {
@ -202,10 +199,6 @@ rec {
nixosTarball = makeTarball "nixos.tar.bz2" ../..; nixosTarball = makeTarball "nixos.tar.bz2" ../..;
# Put Services in a tarball.
servicesTarball = makeTarball "services.tar.bz2" services;
# Put Nixpkgs in a tarball. # Put Nixpkgs in a tarball.
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs; nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
@ -272,9 +265,6 @@ rec {
{ source = nixpkgsTarball + "/nixpkgs.tar.bz2"; { source = nixpkgsTarball + "/nixpkgs.tar.bz2";
target = "/install/nixpkgs.tar.bz2"; target = "/install/nixpkgs.tar.bz2";
} }
{ source = servicesTarball + "/services.tar.bz2";
target = "/install/services.tar.bz2";
}
]; ];
# Closures to be copied to the Nix store on the CD. # Closures to be copied to the Nix store on the CD.