networkmanager service: make wanted by network.target, drop networkmanager-init
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user