diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-04 12:02:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 12:02:36 +0300 |
| commit | 7239f0198ed7d22327d54af90b390aee2fbd5b27 (patch) | |
| tree | c7e1d2dc11970bb109d28689233270e4c34e1936 /nixos/modules/system | |
| parent | 42f2e2daddab11a555b94cc97287017851f98a91 (diff) | |
| parent | 710b96b191b1585ed655b074879d30313a532c6d (diff) | |
| download | nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar.gz nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar.bz2 nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar.lz nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar.xz nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.tar.zst nixlib-7239f0198ed7d22327d54af90b390aee2fbd5b27.zip | |
Merge pull request #258920 from ElvishJerricco/systemd-stage-1-full-build
systemd-stage-1: Default to full systemd build.
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index dc24738a3f9d..a5084260daab 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2890,8 +2890,6 @@ let (mkIf cfg.enable { - systemd.package = mkDefault pkgs.systemdStage1Network; - # For networkctl systemd.dbus.enable = mkDefault true; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index b20b0168e40f..61af2768e295 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -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 { |