From e73b328403e0ddd2be2ac495d83c988300d709e3 Mon Sep 17 00:00:00 2001
From: Bjoern Franke <bjo@nord-west.org>
Date: Thu, 27 Feb 2014 04:24:52 +0100
Subject: [PATCH] use extra fastdreg-config and proper installscripts
---
fastdreg/Makefile | 9 ++++++++-
fastdreg/files/etc/init.d/fastdreg | 7 -------
fastdreg/files/lib/ffol/fastdreg/fastdreg.sh | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100755 fastdreg/files/etc/init.d/fastdreg
diff --git a/fastdreg/Makefile b/fastdreg/Makefile
index dd27b7d..70a51eb 100644
--- a/fastdreg/Makefile
+++ b/fastdreg/Makefile
@@ -30,7 +30,14 @@ define Build/Compile
endef
define Package/ffol-fastdreg/install
- $(CP) ./files/* $(1)/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_BIN) files/fastdreg.init $(1)/etc/init.d/fastdreg
+ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
+ $(INSTALL_DATA) files/etc/hotplug.d/iface/50-fastdstart $(1)/etc/hotplug.d/iface/
+ $(INSTALL_DIR) $(1)/lib/ffol/fastdreg/
+ $(INSTALL_BIN) files/lib/ffol/fastdreg/fastdreg.sh $(1)/lib/ffol/fastdreg/
+ $(INSTALL_DIR) $(1)/etc/config/
+ $(INSTALL_CONF) files/fastdreg.config $(1)/etc/config/fastdreg
endef
$(eval $(call BuildPackage,ffol-fastdreg))
diff --git a/fastdreg/files/etc/init.d/fastdreg b/fastdreg/files/etc/init.d/fastdreg
deleted file mode 100755
index 08055dc..0000000
--- a/fastdreg/files/etc/init.d/fastdreg
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-fastdenabled=$(uci get fastd.mesh_vpn.enabled)
-fastdregdone=$(uci get fastd.regdone)
-
-if [ $fastdenabled ] && [ ! $fastdregdone ]; then
- /lib/ffol/fastdreg/fastdreg.sh
-fi
diff --git a/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh b/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh
index 845d326..ba8b5a7 100755
--- a/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh
+++ b/fastdreg/files/lib/ffol/fastdreg/fastdreg.sh
@@ -7,13 +7,13 @@ hostname=$(uci get system.@system[0].hostname)
pubkey=$(/etc/init.d/fastd show_key mesh_vpn)
-regdone=$(uci get fastd.regdone)
+regdone=$(uci get fastdreg.ffol.regdone)
-if [ -z $regdone ]; then
+if [ $regdone ]; then
reg=$(wget -T15 "$keysrv/reg.php?name=$hostname&key=$pubkey" -O -)
if [ "$reg" == "regdone" ]; then
- uci set fastd.regdone=1
+ uci set fastdreg.ffol.regdone=1
fi
fi
--
GitLab