diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-11 08:13:04 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-09-11 08:13:04 +0200 |
| commit | c58654e2b78e7d3ae97ba96c80ceb3f96236e463 (patch) | |
| tree | df1bc2cf89d9661da6b102ea94328bad0a5734c9 /nixos/modules/services/networking/avahi-daemon.nix | |
| parent | 3d479813f5919b6f87fac714d547cf1d1541bb8a (diff) | |
treewide: fix fallout of ip-up deprecation
See #18319 for details. Starting network-online.target manually does not
work as it hangs indefinitely.
Additionally, don't treat avahi and dhcpcd special and sync their systemd units
with the respective upstream suggestion.
Diffstat (limited to 'nixos/modules/services/networking/avahi-daemon.nix')
| -rw-r--r-- | nixos/modules/services/networking/avahi-daemon.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 2d3ce34a4e3a..ecc091d1d03d 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -7,10 +7,6 @@ let cfg = config.services.avahi; - # We must escape interfaces due to the systemd interpretation - subsystemDevice = interface: - "sys-subsystem-net-devices-${utils.escapeSystemdPath interface}.device"; - avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" '' [server] ${# Users can set `networking.hostName' to the empty string, when getting @@ -180,14 +176,8 @@ in environment.systemPackages = [ pkgs.avahi ]; systemd.services.avahi-daemon = - let - deps = optionals (cfg.interfaces!=null) (map subsystemDevice cfg.interfaces); - in { description = "Avahi daemon"; - wantedBy = [ "ip-up.target" ]; - bindsTo = deps; - after = deps; - before = [ "ip-up.target" ]; + wantedBy = [ "multi-user.target" ]; # Receive restart event after resume partOf = [ "post-resume.target" ]; |