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

stage-1: Don't create a log file in $out

This commit is contained in:
Eelco Dolstra 2013-01-22 16:26:51 +01:00
parent 64ffca1e06
commit ca4f93d3ae
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/system/boot/stage-1.nix
View File

@ -152,8 +152,7 @@ let
doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux"); doublePatchelf = (pkgs.stdenv.system == "armv5tel-linux");
} }
'' ''
ensureDir $out/bin mkdir -p $out/bin $out/lib
ensureDir $out/lib
# Copy what we need from Glibc. # Copy what we need from Glibc.
cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
@ -228,8 +227,8 @@ let
export LD_LIBRARY_PATH=$out/lib export LD_LIBRARY_PATH=$out/lib
$out/bin/mount --help 2>&1 | grep "BusyBox" $out/bin/mount --help 2>&1 | grep "BusyBox"
$out/bin/udevadm --version $out/bin/udevadm --version
$out/bin/dmsetup --version 2>&1 | tee -a $out/log | grep "version:" $out/bin/dmsetup --version 2>&1 | tee -a log | grep "version:"
LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a $out/log | grep "LVM" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep "LVM"
$out/bin/mdadm --version $out/bin/mdadm --version
${config.boot.initrd.extraUtilsCommandsTest} ${config.boot.initrd.extraUtilsCommandsTest}