public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "networkmanager,modemmanager: fix service symlinks for systemd v243"

Browse Source
This commit is contained in:
worldofpeace
2019-09-14 08:04:28 -04:00
committed by GitHub
parent e8bc2a6ac0
commit 3cb0ae999f
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/networkmanager.nix
-5
View File
@@ -468,16 +468,12 @@ 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" ];
@@ -499,7 +495,6 @@ 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