diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-14 08:03:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-14 08:03:12 -0400 |
| commit | e8bc2a6ac089c43e5a9c55a21074529bb12ed82c (patch) | |
| tree | 120fe5109471ed09e13752d8775066deb4c4d1fb /nixos/modules | |
| parent | e06aa820c912127dc00d9b1395861feb0b484538 (diff) | |
| parent | f99bdb2b615da434e0f2814a5924a2aa6a7a1f66 (diff) | |
| download | nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar.gz nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar.bz2 nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar.lz nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar.xz nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.tar.zst nixpkgs-e8bc2a6ac089c43e5a9c55a21074529bb12ed82c.zip | |
Merge pull request #68731 from dtzWill/fix/networkmanager-dbus-service-aliases
networkmanager,modemmanager: fix service symlinks for systemd v243
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index db4d0e328e2..db047e6d0b8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -468,12 +468,16 @@ in { mkdir -m 700 -p /etc/ipsec.d mkdir -m 755 -p ${stateDirs} ''; + + aliases = [ "dbus-org.freedesktop.NetworkManager.service" ]; }; systemd.services.NetworkManager-wait-online = { wantedBy = [ "network-online.target" ]; }; + systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; + systemd.services.nm-setup-hostsdirs = mkIf dynamicHostsEnabled { wantedBy = [ "NetworkManager.service" ]; before = [ "NetworkManager.service" ]; @@ -495,6 +499,7 @@ in { # useful binaries for user-specified hooks path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; + aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ]; }; # Turn off NixOS' network management when networking is managed entirely by NetworkManager |