diff options
| author | Lassulus <github@lassul.us> | 2022-04-04 18:25:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 18:25:02 +0100 |
| commit | aedd6ccfc6db9c1e2793f217d6be4c0f2586af8c (patch) | |
| tree | 8b3962330735bd9bd03451787520cad37e2a76fe | |
| parent | 8461b0c41ab11bf23d63814917124fd3d1a4a309 (diff) | |
| parent | 41d3ca0677077cf9d74d4c636f9c300014585c2c (diff) | |
Merge pull request #167206 from helsinki-systems/feat/systemd-stage-1-own-systemd
nixos/systemd-stage-1: Use an own systemd package
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 36a14d7a82565..d37bdbbcee56d 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 f0c3fa71a8911..dda72f65b179f 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 |