From 41d3ca0677077cf9d74d4c636f9c300014585c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 4 Apr 2022 18:10:43 +0100 Subject: [PATCH] nixos/systemd-stage-1: Use an own systemd package We need more features than systemdMinimal but less than systemd so we need some own packages :/ --- nixos/modules/system/boot/systemd/initrd.nix | 2 +- pkgs/top-level/all-packages.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 36a14d7a8256..d37bdbbcee56 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -150,7 +150,7 @@ in { ''; package = (mkPackageOption pkgs "systemd" { - default = "systemdMinimal"; + default = "systemdStage1"; }) // { visible = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c3fa71a891..dda72f65b179 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23370,6 +23370,17 @@ with pkgs; libfido2 = null; p11-kit = null; }; + systemdStage1 = systemdMinimal.override { + pname = "systemd-stage-1"; + withCryptsetup = true; + withFido2 = true; + withTpm2Tss = true; + inherit lvm2 libfido2 p11-kit; + }; + systemdStage1Network = systemdStage1.override { + pname = "systemd-stage-1-network"; + withNetworkd = true; + }; udev = systemd; # TODO: change to systemdMinimal