Create systemd-{network,resolve} user/group unconditionally

This shuts up this error from dbus:

May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-network" in message bus configuration file
May 11 13:52:16 machine dbus-daemon[259]: Unknown username "systemd-resolve" in message bus configuration file

which happens because the D-Bus config for networkd/resolved is
enabled unconditionally, and we don't have an easy way to turn it off.
This commit is contained in:
Eelco Dolstra 2015-05-11 15:54:16 +02:00
parent c52a983806
commit f19b58fb6a
3 changed files with 5 additions and 6 deletions

View File

@ -641,9 +641,6 @@ in
environment.etc."systemd/network".source = environment.etc."systemd/network".source =
generateUnits "network" cfg.units [] []; generateUnits "network" cfg.units [] [];
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
systemd.services.systemd-networkd = { systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
before = [ "network-interfaces.target" ]; before = [ "network-interfaces.target" ];

View File

@ -30,9 +30,6 @@ with lib;
DNS=${concatStringsSep " " config.networking.nameservers} DNS=${concatStringsSep " " config.networking.nameservers}
''; '';
users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
}; };
} }

View File

@ -649,6 +649,11 @@ in
${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
''; '';
users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
# Target for charon send-keys to hook into. # Target for charon send-keys to hook into.
users.extraGroups.keys.gid = config.ids.gids.keys; users.extraGroups.keys.gid = config.ids.gids.keys;