mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-07 04:34:46 +00:00
make-initrd: fix #132059
This commit is contained in:
parent
439b160522
commit
b0fc6e8ff9
@ -78,7 +78,7 @@ let
|
|||||||
in stdenvNoCC.mkDerivation rec {
|
in stdenvNoCC.mkDerivation rec {
|
||||||
inherit name makeUInitrd extension uInitrdArch prepend;
|
inherit name makeUInitrd extension uInitrdArch prepend;
|
||||||
|
|
||||||
${if makeUInitrd then "uinitrdCompression" else null} = uInitrdCompression;
|
${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression;
|
||||||
|
|
||||||
builder = ./make-initrd.sh;
|
builder = ./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")
|
(cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
|
||||||
|
|
||||||
if [ -n "$makeUInitrd" ]; then
|
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
|
# Compatibility symlink
|
||||||
ln -s "initrd.img" "$out/initrd"
|
ln -sf "initrd.img" "$out/initrd"
|
||||||
else
|
else
|
||||||
ln -s "initrd" "$out/initrd$extension"
|
ln -s "initrd" "$out/initrd$extension"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user