From b0fc6e8ff921343e365f726a96b8419515936f4d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 2 Aug 2021 23:11:25 +0200 Subject: [PATCH] make-initrd: fix #132059 --- pkgs/build-support/kernel/make-initrd.nix | 2 +- pkgs/build-support/kernel/make-initrd.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 83d3bb65bae..23ce992f0d5 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -78,7 +78,7 @@ let in stdenvNoCC.mkDerivation rec { inherit name makeUInitrd extension uInitrdArch prepend; - ${if makeUInitrd then "uinitrdCompression" else null} = uInitrdCompression; + ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression; builder = ./make-initrd.sh; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index c0619ef14ae..70884741af3 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -43,9 +43,9 @@ done (cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then - mkimage -A $uInitrdArch -O linux -T ramdisk -C "$uInitrdCompression" -d $out/initrd"$extension" $out/initrd.img + mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img # Compatibility symlink - ln -s "initrd.img" "$out/initrd" + ln -sf "initrd.img" "$out/initrd" else ln -s "initrd" "$out/initrd$extension" fi