Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f0aba000b89
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c41b37ef25ec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 18, 2019

  1. nixos/networkmanager: use tmpfiles to setup state directories

    @flokli
    flokli committed Oct 18, 2019
    Copy the full SHA
    5e59303 View commit details

  2. nixos/networkmanager: use tmpfiles to setup state directories (#71322) 

    nixos/networkmanager: use tmpfiles to setup state directories
    @flokli
    flokli authored Oct 18, 2019
    Copy the full SHA
    c41b37e View commit details
Showing with 13 additions and 9 deletions.
  1. +13 −9 nixos/modules/services/networking/networkmanager.nix
22 changes: 13 additions & 9 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -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 = {