lede-packages-rs

commit c1195229df3fb7a088010971bfb54db4a50d97ff
parent 5c51f03557719d01c49472bf2ac91ed9cab1906c
Author: Alessio Caiazza <nolith@abisso.org>
Date:   Mon, 11 Aug 2014 12:24:27 +0200

Currently tinc init script will delete the generated configuration folder and then check if it will not exists in order to create it.
This patch will first check if the generated configuration folder exists and then delete it, after that it will always create the configuration folder.

Diffstat:
M
net/tinc/Makefile
 | 
2
+-
M
net/tinc/files/tinc.init
 | 
6
++----

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/tinc/Makefile b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.0.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages
diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
@@ -135,10 +135,8 @@ prepare_net() {
 
 	section_enabled "$s" || return 1
 
-        # rm old config
-        rm -rf "$TMP_TINC/$s/"
-
-	[ ! -d "$TMP_TINC/$s" ] && mkdir -p "$TMP_TINC/$s"
+	[ -d "$TMP_TINC/$s" ] && rm -rf "$TMP_TINC/$s/"
+	mkdir -p "$TMP_TINC/$s"
 	[ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/"
 
 	# append flags