From 16f7b622c08303e4607ea673b20d438cea3d5aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 1 Jan 2015 21:02:33 +0100 Subject: [PATCH 1/2] dhcp: fork in background --- tinc-up | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tinc-up b/tinc-up index a052134..c0187de 100755 --- a/tinc-up +++ b/tinc-up @@ -68,14 +68,24 @@ set_ip() { fi } +start_dhclient() { + local interface=$1 + if [[ "$OSTYPE" == "linux-gnu" ]]; then + dhclient -nw "$interface" + elif [[ "$OSTYPE" == "freebsd"* ]]; then + dhclient -b "$interface" + else + nohup setsid dhclient "$interface" >/dev/null 2>&1 + fi +} + start_dhcp() { local interface=$1 if has dhcpcd; then - dhcpcd "$interface" + dhcpcd -b -n "$interface" elif has dhclient; then - dhclient "$interface" - elif [[ "$OSTYPE" == "darwin"* ]]; then # TODO - untested + start_dhclient "$interface" + elif [[ "$OSTYPE" == "darwin"* ]]; then # TODO untested ipconfig set "$interface" DHCP else die "no suitable dhcp program found, need dhcpcd or dhclient" From 2d6f9c6cc73194cbfe8607cf738322dccaed8e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 1 Jan 2015 21:02:47 +0100 Subject: [PATCH 2/2] hosts/eve: new port --- hosts/eve | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/eve b/hosts/eve index 3e36cae..2d08545 100644 --- a/hosts/eve +++ b/hosts/eve @@ -1,5 +1,6 @@ Subnet = 02:1F:C8:16:F2:C0 Address = tinc.higgsboson.tk +Port = 666 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsGG/m+wr4Q5yRiJXojYu9bV1AgS7U7xUTe39RBAnuEEbpxgQ3SKP LLqf3ZBRkSeJ4xpevv66h7rR1/CIJ+xGbi2+m2QHLB66tGYUKQZIDa8TY9oss6lt