From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Wed, 2 Sep 2015 08:39:52 +0000 (+0200)
Subject: Merge branch 'master' into android
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=74f895f4450213dad1369c5d78becc1e4f1a389c;hp=-c;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git

Merge branch 'master' into android
---

74f895f4450213dad1369c5d78becc1e4f1a389c
diff --combined ImmaeEu-down
index db41301,d5e9ccf..657b83f
mode 100644,100755..100644
--- a/ImmaeEu-down
+++ b/ImmaeEu-down
@@@ -1,12 -1,11 +1,12 @@@
- #!/bin/sh
 -#!/bin/sh
++#!/system/xbin/sh
  # This file closes down the tap device.
  
 -. /tmp/tinc_$NETNAME
 -rm -f /tmp/tinc_$NETNAME
 +source /sdcard/.tinc/vars
 +rm /sdcard/.tinc/vars
 +
  ip -6 route del default via $GWIP
  for MYIP in $MYIPS; do
 -	ip -6 addr del $MYIP/96 dev $INTERFACE
 +	ip -6 addr del $MYIP/96 dev vpn6
  done
 -ip -6 link set $INTERFACE down
 +ip -6 link set vpn6 down