Commit 85982346 authored by Will Fancher's avatar Will Fancher
Browse files

systemd-initrd: dbus

parent 834ec135

nixos/modules/services/system/dbus.nix

+20 −1
Original line number Diff line number Diff line
@@ -14,13 +14,17 @@ let 
    serviceDirectories = cfg.packages;

  };



  inherit (lib) mkOption mkIf mkMerge types;

  inherit (lib) mkOption mkEnableOption mkIf mkMerge types;



in



{

  options = {



    boot.initrd.systemd.dbus = {

      enable = mkEnableOption (lib.mdDoc "dbus in stage 1") // { visible = false; };

    };



    services.dbus = {



      enable = mkOption {
@@ -111,6 +115,21 @@ in 
      ];

    }



    (mkIf config.boot.initrd.systemd.dbus.enable {

      boot.initrd.systemd = {

        users.messagebus = { };

        groups.messagebus = { };

        contents."/etc/dbus-1".source = pkgs.makeDBusConf {

          inherit (cfg) apparmor;

          suidHelper = "/bin/false";

          serviceDirectories = [ pkgs.dbus ];

        };

        packages = [ pkgs.dbus ];

        storePaths = [ "${pkgs.dbus}/bin/dbus-daemon" ];

        targets.sockets.wants = [ "dbus.socket" ];

      };

    })



    (mkIf (cfg.implementation == "dbus") {

      environment.systemPackages = [

        pkgs.dbus

nixos/modules/system/boot/networkd.nix

+3 −0
Original line number Diff line number Diff line
@@ -3155,6 +3155,9 @@ let 


      systemd.package = pkgs.systemdStage1Network;



      # For networkctl

      systemd.dbus.enable = mkDefault true;



      systemd.additionalUpstreamUnits = [

        "systemd-networkd-wait-online.service"

        "systemd-networkd.service"