diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /nixos | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'nixos')
| -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 db4d0e328e2d..db047e6d0b89 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 |