nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 04:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Add the installer and rsync to the path.

Browse Source 
svn path=/nixu/trunk/; revision=6979
This commit is contained in:
Eelco Dolstra 2006-11-08 09:31:45 +00:00
parent 6705045334
commit 4b333e0f67
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/installer.nix
View File

@ -3,6 +3,7 @@
genericSubstituter { genericSubstituter {
src = ./installer.sh; src = ./installer.sh;
dir = "bin";
isExecutable = true; isExecutable = true;
inherit shell nix; inherit shell nix;

2
test/installer.sh
View File

@ -37,5 +37,5 @@ mount "$targetDevice" $mountPoint || exit 1
# Copy Nix to the Nix store on the target device. # Copy Nix to the Nix store on the target device.
mkdir -p $mountPoint/nix/store/ mkdir -p $mountPoint/nix/store/
cp -prd $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1 rsync -av $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1

16
test/rescue-system.nix
View File

@ -60,6 +60,13 @@ rec {
}; };
# The installer.
nixosInstaller = import ./installer.nix {
inherit (pkgs) stdenv genericSubstituter nix;
shell = pkgs.bash + "/bin/sh";
};
# The init script of boot stage 2, which is supposed to do # The init script of boot stage 2, which is supposed to do
# everything else to bring up the system. # everything else to bring up the system.
bootStage2 = import ./boot-stage-2.nix { bootStage2 = import ./boot-stage-2.nix {
@ -92,19 +99,14 @@ rec {
pkgs.procps pkgs.procps
pkgs.shadowutils pkgs.shadowutils
pkgs.sysklogd pkgs.sysklogd
pkgs.rsync
nixosInstaller
]; ];
mingetty = pkgs.mingettyWrapper; mingetty = pkgs.mingettyWrapper;
}; };
# The installer.
nixosInstaller = import ./installer.nix {
inherit (pkgs) stdenv genericSubstituter nix;
shell = pkgs.bash + "/bin/sh";
};
# Since the CD is read-only, the mount points must be on disk. # Since the CD is read-only, the mount points must be on disk.
cdMountPoints = pkgs.stdenv.mkDerivation { cdMountPoints = pkgs.stdenv.mkDerivation {
name = "mount-points"; name = "mount-points";