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

Rewrite NetworkManager job to systemd service

Browse Source
This commit is contained in:
Rickard Nilsson 2013-01-03 18:55:56 +01:00
parent e89afd7d89
commit c6bb091b5b
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
modules/services/networking/networkmanager.nix
View File

@ -1,13 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
with pkgs;
let let
cfg = config.networking.networkmanager; cfg = config.networking.networkmanager;
stateDirs = "/var/lib/NetworkManager /var/lib/dhclient"; stateDirs = "/var/lib/NetworkManager /var/lib/dhclient";
configFile = pkgs.writeText "NetworkManager.conf" '' configFile = writeText "NetworkManager.conf" ''
[main] [main]
plugins=keyfile plugins=keyfile
@ -36,7 +37,7 @@ let
ResultActive=yes ResultActive=yes
''; '';
ipUpScript = pkgs.writeScript "01nixos-ip-up" '' ipUpScript = writeScript "01nixos-ip-up" ''
#!/bin/sh #!/bin/sh
if test "$2" = "up"; then if test "$2" = "up"; then
${config.systemd.package}/bin/systemctl start ip-up.target ${config.systemd.package}/bin/systemctl start ip-up.target
@ -67,7 +68,7 @@ in {
Extra packages that provide NetworkManager plugins. Extra packages that provide NetworkManager plugins.
''; '';
merge = mergeListOption; merge = mergeListOption;
apply = list: [ pkgs.networkmanager pkgs.modemmanager ] ++ list; apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
}; };
}; };
@ -76,10 +77,14 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.etc = singleton { environment.etc = [
source = ipUpScript; { source = ipUpScript;
target = "NetworkManager/dispatcher.d/01nixos-ip-up"; target = "NetworkManager/dispatcher.d/01nixos-ip-up";
}; }
{ source = configFile;
target = "NetworkManager/NetworkManager.conf";
}
];
environment.systemPackages = cfg.packages; environment.systemPackages = cfg.packages;
@ -88,24 +93,31 @@ in {
gid = config.ids.gids.networkmanager; gid = config.ids.gids.networkmanager;
}; };
jobs.networkmanager = { systemd.packages = cfg.packages;
startOn = "started network-interfaces";
stopOn = "stopping network-interfaces";
path = [ pkgs.networkmanager ]; # Create an initialisation service that both starts
# NetworkManager when network.target is reached,
preStart = '' # and sets up necessary directories for NM.
mkdir -m 755 -p /etc/NetworkManager systemd.services."NetworkManager-init" = {
description = "NetworkManager initialisation";
wantedBy = [ "network.target" ];
partOf = [ "NetworkManager.service" ];
wants = [ "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
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 = {
exec = "NetworkManager --config=${configFile} --no-daemon"; Type = "oneshot";
};
}; };
networking.useDHCP = false; # Turn off NixOS' network management
networking = {
networking.wireless.enable = true; useDHCP = false;
wireless.enable = false;
};
security.polkit.permissions = polkitConf; security.polkit.permissions = polkitConf;