diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-25 12:03:03 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-25 14:14:46 -0700 |
| commit | f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb (patch) | |
| tree | f323b654b10f74f15fb6d41ba92e1686e8a691fb /pkgs/build-support | |
| parent | 8baaff95e6636174ebdf01abe91a4c351234c0ff (diff) | |
| download | nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar.gz nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar.bz2 nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar.lz nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar.xz nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.tar.zst nixlib-f2655e4fa0065aab52d7616e3b3ec8eb8cc24ddb.zip | |
makeInitrd: Support prepending other initrds
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/make-initrd.sh | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 0582ca553012..895160616b79 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor}: +{ stdenv, perl, perlArchiveCpio, cpio, contents, ubootChooser, compressor, prepend }: let inputsFun = ubootName : [perl cpio perlArchiveCpio ] @@ -41,5 +41,5 @@ stdenv.mkDerivation { nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; }; - inherit compressor; + inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 17b261f98407..08961a1b49c2 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -36,7 +36,10 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. mkdir -p $out -(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor > $out/initrd) +for PREP in $prepend; do + cat $PREP >> $out/initrd +done +(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd) if [ -n "$makeUInitrd" ]; then mv $out/initrd $out/initrd.gz |