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

networkmanager service: make wanted by network.target, drop networkmanager-init

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-08-14 13:27:14 +03:00
parent fc7e8bd96e
commit bda3423b3a
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/networking/networkmanager.nix
View File

@ -235,19 +235,13 @@ in {
systemd.packages = cfg.packages; systemd.packages = cfg.packages;
# Create an initialisation service that both starts systemd.services."network-manager" = {
# NetworkManager when network.target is reached,
# and sets up necessary directories for NM.
systemd.services."networkmanager-init" = {
description = "NetworkManager initialisation";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
wants = [ "network-manager.service" ];
before = [ "network-manager.service" ]; preStart = ''
script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections mkdir -m 700 -p /etc/NetworkManager/system-connections
mkdir -m 755 -p ${stateDirs} mkdir -m 755 -p ${stateDirs}
''; '';
serviceConfig.Type = "oneshot";
}; };
# Turn off NixOS' network management # Turn off NixOS' network management