summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2020-08-25 12:02:53 +0200
committerLinus Heckemann <git@sphalerite.org>2020-08-25 12:10:30 +0200
commit27f0ca6670911a42349037ce41de5314dc585d33 (patch)
tree09e299e27aeff66a863539d90c448690c3ff01a8 /nixos/modules/system
parent7b527223fde76cdfb8adec63c8546d60b795a9fb (diff)
downloadnixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar.gz
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar.bz2
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar.lz
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar.xz
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.tar.zst
nixpkgs-27f0ca6670911a42349037ce41de5314dc585d33.zip
stage-1 find-libs: initialise left to empty array
declare -a is not sufficient to make the array variable actually
exist, which resulted in the script failing when the target object did
not have any DT_NEEDED entries. This in turn resulted in some
initramfs libraries not having their rpaths patched to point to
extra-utils, which in turn broke the extra-utils tests.
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/stage-1.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index a04660fb56e..eee510d2c95 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -36,7 +36,7 @@ let
     set -euo pipefail
 
     declare -A seen
-    declare -a left
+    left=()
 
     patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf"
 
@@ -48,7 +48,7 @@ let
       done
     }
 
-    add_needed $1
+    add_needed "$1"
 
     while [ ''${#left[@]} -ne 0 ]; do
       next=''${left[0]}