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: 9b898eca6df1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1554e4a95eac
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 18, 2019

  1. networkmanager-fortisslvpn: create the local state directory 

    Otherwise connecting simply fails:
VPN connection: failed to connect: 'La création du fichier « /tmp/lib/NetworkManager-fortisslvpn/0507e3ef-f0e0-4153-af64-b3d9a025877c.config.XSB19Z » a échoué : No such file or directory'
    @symphorien @worldofpeace
    symphorien authored and worldofpeace committed Oct 18, 2019
    Copy the full SHA
    a37b963 View commit details

  2. Merge pull request #71298 from symphorien/nm-fortissl 

    networkmanager-fortisslvpn: create the local state directory
    @worldofpeace
    worldofpeace authored Oct 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1554e4a View commit details
Showing with 6 additions and 1 deletion.
  1. +1 −0 nixos/modules/services/networking/networkmanager.nix
  2. +5 −1 pkgs/tools/networking/network-manager/fortisslvpn/default.nix
1 change: 1 addition & 0 deletions nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -472,6 +472,7 @@ in {
systemd.tmpfiles.rules = [
"d /etc/NetworkManager/system-connections 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/misc 0755 root root -" # for dnsmasq.leases
6 changes: 5 additions & 1 deletion pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,14 @@ in stdenv.mkDerivation {
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/tmp"
"--localstatedir=/var"
"--enable-absolute-paths"
];

# the installer only create an empty directory in localstatedir, so
# we can drop it
installFlags = [ "localstatedir=." ];

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;