Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/networkmanager: use tmpfiles to setup state directories #71322

Merged
merged 1 commit into from Oct 18, 2019
Merged

nixos/networkmanager: use tmpfiles to setup state directories #71322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions nixos/modules/services/networking/networkmanager.nix
View file
Open in desktop
Expand Up @@ -24,9 +24,6 @@ let

enableIwd = cfg.wifi.backend == "iwd";

# /var/lib/misc is for dnsmasq.leases.
stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";

configFile = pkgs.writeText "NetworkManager.conf" ''
[main]
plugins=keyfile
Expand Down Expand Up @@ -472,17 +469,24 @@ in {

systemd.packages = cfg.packages;

systemd.tmpfiles.rules = [
"d /etc/NetworkManager/system-connections 0700 root root -"
"d /etc/ipsec.d 0700 root root -"

"d /var/lib/dhclient 0755 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
];

systemd.services.NetworkManager = {
wantedBy = [ "network.target" ];
restartTriggers = [ configFile ];

preStart = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections
mkdir -m 700 -p /etc/ipsec.d
mkdir -m 755 -p ${stateDirs}
'';

aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];

serviceConfig = {
StateDirectory = "NetworkManager";
StateDirectoryMode = 755; # not sure if this really needs to be 755
};
};

systemd.services.NetworkManager-wait-online = {
Expand Down