Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6653a35faa75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b46fba45159d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 13, 2020

  1. nixos/resolved: Include dbus alias of resolved unit 

    This will make dbus socket activation for it work

When `systemd-resolved` is restarted; this would lead to unavailability
of DNS lookups.  You're supposed to use DBUS socket activation to buffer
resolved requests; such that restarts happen without downtime
    @arianvp @flokli
    arianvp authored and flokli committed Jun 13, 2020
    Copy the full SHA
    0e18e5d View commit details

  2. nixos/networkd: Make activatible through dbus and netlink 

    With this systemd buffers netlink messages in early boot from the kernel
itself; and passes them on to networkd for processing once it's started.
Makes sure no routing messages are missed.

Also makes an alias so that dbus can activate this unit. Upstream has
this too.
    @arianvp @flokli
    arianvp authored and flokli committed Jun 13, 2020
    Copy the full SHA
    cd1deda View commit details

  3. nixos/timesyncd: Make dbus-activatible 

    Upstream has this alias too; so that dbus activation works.
What I don't fully understand is why this would ever be useful given
this unit is already started way in early boot; even before dbus is up.
But lets just keep behaviour similar to upstream and then ask these
questions to upstream.
    @arianvp @flokli
    arianvp authored and flokli committed Jun 13, 2020
    Copy the full SHA
    71a6d32 View commit details

  4. Merge pull request #88158 from arianvp/dbus-systemd 

    Some systemd fixes revolving dbus and socket activation of systemd services
    @flokli
    flokli authored Jun 13, 2020
    Copy the full SHA
    b46fba4 View commit details
Showing with 11 additions and 1 deletion.
  1. +9 −1 nixos/modules/system/boot/networkd.nix
  2. +1 −0 nixos/modules/system/boot/resolved.nix
  3. +1 −0 nixos/modules/system/boot/timesyncd.nix
10 changes: 9 additions & 1 deletion nixos/modules/system/boot/networkd.nix
View file
Original file line number Diff line number Diff line change
@@ -1178,14 +1178,22 @@ in
users.users.systemd-network.group = "systemd-network";

systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
"systemd-networkd-wait-online.service"
"systemd-networkd.service"
"systemd-networkd.socket"
];

systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
// mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;

# systemd-networkd is socket-activated by kernel netlink route change
# messages. It is important to have systemd buffer those on behalf of
# networkd.
systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ];

systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.network1.service" ];
restartTriggers = map (x: x.source) (attrValues unitFiles);
# prevent race condition with interface renaming (#39069)
requires = [ "systemd-udev-settle.service" ];
1 change: 1 addition & 0 deletions nixos/modules/system/boot/resolved.nix
View file
Original file line number Diff line number Diff line change
@@ -148,6 +148,7 @@ in

systemd.services.systemd-resolved = {
wantedBy = [ "multi-user.target" ];
aliases = [ "dbus-org.freedesktop.resolve1.service" ];
restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
};

1 change: 1 addition & 0 deletions nixos/modules/system/boot/timesyncd.nix
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,7 @@ with lib;

systemd.services.systemd-timesyncd = {
wantedBy = [ "sysinit.target" ];
aliases = [ "dbus-org.freedesktop.timesync1.service" ];
restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];
};