From a045ec654911737453b7f6e9918c4c23b517b516 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Feb 2014 18:57:17 +0100
Subject: [PATCH] gluon-legacy: gluon-mesh-batman-adv: always set proto to
 dhcpv6

---
 .../lib/gluon/upgrade/mesh-batman-adv/legacy/010-mesh  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/package/gluon-legacy/generate/lib/gluon/upgrade/mesh-batman-adv/legacy/010-mesh b/package/gluon-legacy/generate/lib/gluon/upgrade/mesh-batman-adv/legacy/010-mesh
index dcd12013c..dbe739699 100755
--- a/package/gluon-legacy/generate/lib/gluon/upgrade/mesh-batman-adv/legacy/010-mesh
+++ b/package/gluon-legacy/generate/lib/gluon/upgrade/mesh-batman-adv/legacy/010-mesh
@@ -7,12 +7,10 @@
 
 uci_rename network '@legacy.mesh_ifname@' 'client'
 
-if [ "$(uci_get network client proto)" = 'none' ]; then
-	uci_remove network client auto
-	uci_remove network client accept_ra
+uci_remove network client auto
+uci_remove network client accept_ra
 
-	uci_set network client proto 'dhcpv6'
-	uci_set network client reqprefix 'no'
-fi
+uci_set network client proto 'dhcpv6'
+uci_set network client reqprefix 'no'
 
 uci_commit network
-- 
GitLab