From patchwork Mon Oct 9 14:43:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: tunneldigger: move symlink creation to vpn-select so it is only created if needed From: Fabian Blaese X-Patchwork-Id: 555 Message-Id: <20171009144332.29297-1-fabian@blaese.de> To: franken-dev@freifunk.net Date: Mon, 9 Oct 2017 16:43:32 +0200 This fixes uci errors caused by symlinking to a non-existant file Signed-off-by: Fabian Bläse --- .../fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger | 2 -- src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger index 09442f1..27bdbfd 100644 --- a/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger +++ b/src/packages/fff/fff-tunneldigger/files/etc/uci-defaults/55_fff-tunneldigger @@ -1,3 +1 @@ /etc/init.d/tunneldigger disable -rm /etc/config/tunneldigger -ln -s /tmp/tunneldigger /etc/config/ diff --git a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select index 150efe2..74311a8 100755 --- a/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select +++ b/src/packages/fff/fff-vpn-select/files/usr/sbin/vpn-select @@ -54,6 +54,11 @@ json_select ".." # back to root # Only do something when file is here and greater 0 byte if [ -s /tmp/keyxchangev2data ]; then + # check if symlink to /tmp exists + if [ "$(readlink -n /etc/config/tunneldigger)" != "/tmp/tunneldigger" ]; then + ln -s /tmp/tunneldigger /etc/config/ + fi + # set some vars hostname=$(cat /proc/sys/kernel/hostname) mac=$(awk '{ mac=toupper($1); gsub(":", "", mac); print mac }' /sys/class/net/br-mesh/address 2>/dev/null)