Unverified Commit 7239f019 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

Merge pull request #258920 from ElvishJerricco/systemd-stage-1-full-build 

systemd-stage-1: Default to full systemd build.
parents 42f2e2da 710b96b1

nixos/modules/profiles/installation-device.nix

+0 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ with lib; 
        jq # for closureInfo

        # For boot.initrd.systemd

        makeInitrdNGTool

        systemdStage1

        systemdStage1Network

      ];



    boot.swraid.enable = true;

nixos/modules/system/boot/networkd.nix

+0 −2
Original line number Diff line number Diff line
@@ -2890,8 +2890,6 @@ let 


    (mkIf cfg.enable {



      systemd.package = mkDefault pkgs.systemdStage1Network;



      # For networkctl

      systemd.dbus.enable = mkDefault true;

nixos/modules/system/boot/systemd/initrd.nix

+7 −2
Original line number Diff line number Diff line
@@ -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 {

pkgs/top-level/all-packages.nix

+0 −14
Original line number Diff line number Diff line
@@ -28962,20 +28962,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 =