diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-29 13:20:27 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-29 13:20:54 -0700 |
| commit | 553105310a5a1a2280fc2c40773ab1cf3fdfad98 (patch) | |
| tree | 32fed418816548a797d34f278542feab934e99d1 /nixos | |
| parent | c31f1d99a51e97178db0dc642d63a2b534301286 (diff) | |
| download | nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar.gz nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar.bz2 nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar.lz nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar.xz nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.tar.zst nixpkgs-553105310a5a1a2280fc2c40773ab1cf3fdfad98.zip | |
nixos/stage-1: Fix the initrd builder for shell scripts
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index ec696d838cc..0bf5a2f3c80 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -45,8 +45,7 @@ let copy_bin_and_libs () { [ -f "$out/bin/$(basename $1)" ] && return 0 cp -pdv $1 $out/bin - LDD="$(ldd $1)" - [ "$?" -eq "1" ] && return 0 + LDD="$(ldd $1)" || return 0 LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')" for LIB in $LIBS; do [ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib |