From 5c742f85165a7b76df852dffdded1b084bda0fe2 Mon Sep 17 00:00:00 2001
From: Julien VAUBOURG <julien@vaubourg.com>
Date: Fri, 14 Nov 2014 20:05:51 +0100
Subject: [PATCH] Add tun0 detection in the service

---
 TODO                    |  1 +
 conf/init_ynh-vpnclient | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 8a00267..5687667 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 * Translate PHP interface in French
+* Add connect-retry-max=3 in openvpn conf
 * Support VPN without certificates (only login) -- added need just tests
 ** Add require for slapd for the service start -- added need just tests
diff --git a/conf/init_ynh-vpnclient b/conf/init_ynh-vpnclient
index 77208dc..1bc066e 100644
--- a/conf/init_ynh-vpnclient
+++ b/conf/init_ynh-vpnclient
@@ -203,6 +203,12 @@ case "${1}" in
         if [ ! $? -eq 0 ]; then
           exit 1
         fi
+
+        (i=0 && false) || while [ $? -ne 0 ]; do
+          sleep 1 && (( i++ ))
+          [ ${i} -gt 20 ] && exit 1
+          ip link show dev tun0 &> /dev/null
+        done
       fi
 
       # Check old state of the server ipv6 route
@@ -223,12 +229,6 @@ case "${1}" in
       # Set the ipv6 address
       if ! has_hotspot_app && has_ip6delegatedprefix && ! is_ip6addr_set; then
         echo "Set IPv6 address"
-
-        false || while [ $? -ne 0 ]; do
-          sleep 1
-          ip link show dev tun0 &> /dev/null
-        done
-
         set_ip6addr
       fi
     fi