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

Merge pull request #71298 from symphorien/nm-fortissl 

networkmanager-fortisslvpn: create the local state directory
This commit is contained in:
worldofpeace 2019-10-18 23:50:33 +00:00 committed by GitHub
parent 9b898eca6d a37b9636f7
commit 1554e4a95e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/networking/networkmanager.nix
View File

@ -472,6 +472,7 @@ in {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /etc/NetworkManager/system-connections 0700 root root -" "d /etc/NetworkManager/system-connections 0700 root root -"
"d /etc/ipsec.d 0700 root root -" "d /etc/ipsec.d 0700 root root -"
"d /var/lib/NetworkManager-fortisslvpn 0700 root root -"
"d /var/lib/dhclient 0755 root root -" "d /var/lib/dhclient 0755 root root -"
"d /var/lib/misc 0755 root root -" # for dnsmasq.leases "d /var/lib/misc 0755 root root -" # for dnsmasq.leases

6
pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View File

@ -32,10 +32,14 @@ in stdenv.mkDerivation {
configureFlags = [ configureFlags = [
"--without-libnm-glib" "--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}" "--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/tmp" "--localstatedir=/var"
"--enable-absolute-paths" "--enable-absolute-paths"
]; ];
# the installer only create an empty directory in localstatedir, so
# we can drop it
installFlags = [ "localstatedir=." ];
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;