systemd-stage-1: Default to full systemd build.
This commit is contained in:
parent
4d29250d5b
commit
710b96b191
4 changed files with 7 additions and 20 deletions
|
@ -102,8 +102,6 @@ with lib;
|
|||
jq # for closureInfo
|
||||
# For boot.initrd.systemd
|
||||
makeInitrdNGTool
|
||||
systemdStage1
|
||||
systemdStage1Network
|
||||
];
|
||||
|
||||
boot.swraid.enable = true;
|
||||
|
|
|
@ -2876,8 +2876,6 @@ let
|
|||
|
||||
(mkIf cfg.enable {
|
||||
|
||||
systemd.package = mkDefault pkgs.systemdStage1Network;
|
||||
|
||||
# For networkctl
|
||||
systemd.dbus.enable = mkDefault true;
|
||||
|
||||
|
|
|
@ -135,8 +135,13 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOptionMD pkgs "systemd" {
|
||||
default = "systemdStage1";
|
||||
package = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = config.systemd.package;
|
||||
defaultText = lib.literalExpression "config.systemd.package";
|
||||
description = ''
|
||||
The systemd package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
|
|
|
@ -28954,20 +28954,6 @@ with pkgs;
|
|||
withUkify = false;
|
||||
withBootloader = false;
|
||||
};
|
||||
systemdStage1 = systemdMinimal.override {
|
||||
pname = "systemd-stage-1";
|
||||
withAcl = true;
|
||||
withCryptsetup = true;
|
||||
withFido2 = true;
|
||||
withKmod = true;
|
||||
withTpm2Tss = true;
|
||||
withRepart = true;
|
||||
};
|
||||
systemdStage1Network = systemdStage1.override {
|
||||
pname = "systemd-stage-1-network";
|
||||
withNetworkd = true;
|
||||
withLibidn2 = true;
|
||||
};
|
||||
|
||||
|
||||
udev =
|
||||
|
|
Loading…
Reference in a new issue