diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
| commit | 41af38f3728bd64b80721c44ed1fb019978cbc1b (patch) | |
| tree | f95e41e3f80b5f9f1f5a6c3462b6352a12575c40 /nixos/modules | |
| parent | f0fec244ca380b9d3e617ee7b419c59758c8b0f1 (diff) | |
| parent | 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (diff) | |
| download | nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.gz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.bz2 nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.lz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.xz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.zst nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.zip | |
Merge branch 'staging-next'
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 |