diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/nixos/modules/system/activation/top-level.nix | |
parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/nixos/modules/system/activation/top-level.nix')
-rw-r--r-- | nixpkgs/nixos/modules/system/activation/top-level.nix | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/nixpkgs/nixos/modules/system/activation/top-level.nix b/nixpkgs/nixos/modules/system/activation/top-level.nix index 07c2e05ce374..1f9ad570db7d 100644 --- a/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -4,38 +4,9 @@ with lib; let systemBuilder = - let - kernelPath = "${config.boot.kernelPackages.kernel}/" + - "${config.system.boot.loader.kernelFile}"; - initrdPath = "${config.system.build.initialRamdisk}/" + - "${config.system.boot.loader.initrdFile}"; - in '' + '' mkdir $out - # Containers don't have their own kernel or initrd. They boot - # directly into stage 2. - ${optionalString config.boot.kernel.enable '' - if [ ! -f ${kernelPath} ]; then - echo "The bootloader cannot find the proper kernel image." - echo "(Expecting ${kernelPath})" - false - fi - - ln -s ${kernelPath} $out/kernel - ln -s ${config.system.modulesTree} $out/kernel-modules - ${optionalString (config.hardware.deviceTree.package != null) '' - ln -s ${config.hardware.deviceTree.package} $out/dtbs - ''} - - echo -n "$kernelParams" > $out/kernel-params - - ln -s ${initrdPath} $out/initrd - - ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out - - ln -s ${config.hardware.firmware}/lib/firmware $out/firmware - ''} - ${if config.boot.initrd.systemd.enable then '' cp ${config.system.build.bootStage2} $out/prepare-root substituteInPlace $out/prepare-root --subst-var-by systemConfig $out @@ -83,7 +54,6 @@ let systemd = config.systemd.package; - kernelParams = config.boot.kernelParams; nixosLabel = config.system.nixos.label; inherit (config.system) extraDependencies; |