public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59423 from lheckemann/initramfs-improvements

Browse Source 
Initramfs improvements
This commit is contained in:
Linus Heckemann 2019-04-14 12:10:26 +02:00 committed by GitHub
commit 0fc80a576a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/system/boot/stage-1.nix
View File

@ -11,7 +11,9 @@ let
udev = config.systemd.package; udev = config.systemd.package;
modulesTree = config.system.modulesTree; kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
firmware = config.hardware.firmware; firmware = config.hardware.firmware;
@ -290,6 +292,7 @@ let
# The closure of the init script of boot stage 1 is what we put in # The closure of the init script of boot stage 1 is what we put in
# the initial RAM disk. # the initial RAM disk.
initialRamdisk = pkgs.makeInitrd { initialRamdisk = pkgs.makeInitrd {
name = "initrd-${kernel-name}";
inherit (config.boot.initrd) compressor prepend; inherit (config.boot.initrd) compressor prepend;
contents = contents =

7
pkgs/build-support/kernel/make-initrd.nix
View File

@ -12,11 +12,14 @@
# `contents = {object = ...; symlink = /init;}' is a typical # `contents = {object = ...; symlink = /init;}' is a typical
# argument. # argument.
{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools { stdenv, perl, cpio, contents, ubootTools
, name ? "initrd"
, compressor ? "gzip -9n"
, prepend ? []
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "initrd"; inherit name;
builder = ./make-initrd.sh; builder = ./make-initrd.sh;
makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage"; makeUInitrd = stdenv.hostPlatform.platform.kernelTarget == "uImage";

4
pkgs/os-specific/linux/kmod/aggregator.nix
View File

@ -1,7 +1,7 @@
{ stdenv, kmod, modules, buildEnv }: { stdenv, kmod, modules, buildEnv, name ? "kernel-modules" }:
buildEnv { buildEnv {
name = "kernel-modules"; inherit name;
paths = modules; paths = modules;

5
pkgs/top-level/all-packages.nix
View File

@ -330,10 +330,7 @@ in
makeAutostartItem = callPackage ../build-support/make-startupitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { };
makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }: makeInitrd = callPackage ../build-support/kernel/make-initrd.nix; # Args intentionally left out
callPackage ../build-support/kernel/make-initrd.nix {
inherit contents compressor prepend;
};
makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; } makeWrapper = makeSetupHook { deps = [ dieHook ]; substitutions = { shell = pkgs.runtimeShell; }; }
../build-support/setup-hooks/make-wrapper.sh; ../build-support/setup-hooks/make-wrapper.sh;