c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/networkmanager: create the correct configured keyfile.path (#530008)

Browse source
This commit is contained in:
Florian Klink 2026-06-11 22:51:12 +00:00 • committed by GitHub
commit ed1ce88e87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
nixos/modules/services/networking/networkmanager.nix
View file

@ -24,6 +24,9 @@ let
rc-manager = if config.networking.resolvconf.enable then "resolvconf" else "unmanaged";
};
keyfile = {
# NM's compiled-in default; made explicit so the tmpfiles rule below
# can follow it when the user redirects the keyfile store elsewhere.
path = "/etc/NetworkManager/system-connections";
unmanaged-devices = if cfg.unmanaged == [ ] then null else lib.concatStringsSep ";" cfg.unmanaged;
};
logging = {
@ -601,13 +604,27 @@ in
systemd.packages = packages;
systemd.tmpfiles.rules = [
"d /etc/NetworkManager/system-connections 0700 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases
systemd.tmpfiles.settings.networkmanager = {
${configAttrs.keyfile.path}.d = {
mode = "0700";
user = "root";
group = "root";
};
# for dnsmasq.leases
"/var/lib/misc".d = {
mode = "0755";
user = "root";
group = "root";
};
# ppp isn't able to mkdir that directory at runtime
"d /run/pppd/lock 0700 root root -"
]
++ pluginTmpfilesRules;
"/run/pppd/lock".d = {
mode = "0700";
user = "root";
group = "root";
};
};
systemd.tmpfiles.rules = pluginTmpfilesRules;
systemd.services.NetworkManager = {
wantedBy = [ "multi-user.target" ];