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

tinc_pre: avoid infinite loop with EBADFD on network restart

Browse Source
This commit is contained in:
Volth 2017-07-27 13:17:13 +00:00 committed by Robin Gloster
parent 4456076bc7
commit 688dc4e4c3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/networking/tinc.nix
View File

@ -169,7 +169,8 @@ in
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
PIDFile = "/run/tinc.${network}.pid"; PIDFile = "/run/tinc.${network}.pid";
Restart = "on-failure"; Restart = "always";
RestartSec = "3";
}; };
preStart = '' preStart = ''
mkdir -p /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/hosts

10
pkgs/tools/networking/tinc/pre.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: { stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tinc-${version}"; name = "tinc-${version}";
@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
substituteInPlace configure.ac --replace UNKNOWN ${version} substituteInPlace configure.ac --replace UNKNOWN ${version}
''; '';
patches = [
# Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart
(fetchpatch {
url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
})
];
postInstall = '' postInstall = ''
rm $out/bin/tinc-gui rm $out/bin/tinc-gui
''; '';