nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

More correct handling of services tarball

Browse Source 
svn path=/nixos/trunk/; revision=15508
This commit is contained in:
Michael Raskin 2009-05-09 07:31:56 +00:00
parent 05a7e1368a
commit 5cbcb9762d
1 changed files with 14 additions and 0 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,6 +5,7 @@
else "nixos-${builtins.readFile ../../VERSION}"
, compressImage ? false
, nixpkgs ? ../../../nixpkgs
, services ? ../../../services
# This option allows easy building of Rescue CD with
# modified package set / driver set / anything.
# For easier maitenance, let overrider know the current
@ -12,6 +13,7 @@
, configurationOverrides ? (config: {})
# Whether to put all the build-time dependencies on DVD
, includeBuildDeps ? false
, includeTarballs ? true
}:
rec {
@ -127,6 +129,8 @@ rec {
tar xjf /install/nixos.tar.bz2 -C /etc/nixos/nixos
mkdir -p /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
end script
";
@ -202,6 +206,10 @@ rec {
nixosTarball = makeTarball "nixos.tar.bz2" ../..;
# Put Services in a tarball.
servicesTarball = makeTarball "services.tar.bz2" services;
# Put Nixpkgs in a tarball.
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgs;
@ -259,12 +267,18 @@ rec {
{ source = system.config.boot.grubSplashImage;
target = "boot/background.xpm.gz";
}
]
++
pkgs.lib.optionals includeTarballs [
{ source = nixosTarball + "/" + nixosTarball.tarName;
target = "/install/" + nixosTarball.tarName;
}
{ source = nixpkgsTarball + "/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.