travelmate: update 0.8.2

* change start priority to 90 and revert hostapd stuff from last commit
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile
index 34a31670c7924abdfe16eedb303d6e26aa5074d8..424ebbeaf277acb335a898f39778f1d3e5ed5e06 100644 (file)
--- a/net/travelmate/Makefile
+++ b/net/travelmate/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=travelmate
-PKG_VERSION:=0.8.1
+PKG_VERSION:=0.8.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

diff --git a/net/travelmate/files/travelmate.init b/net/travelmate/files/travelmate.init
index f5f21da89df916a5c92e66bd957a64633fb45314..888db203307921f4c7af50472b47e1f8639d834e 100755 (executable)
--- a/net/travelmate/files/travelmate.init
+++ b/net/travelmate/files/travelmate.init
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=35
+START=90
 USE_PROCD=1
 
 EXTRA_COMMANDS="status"
@@ -11,7 +11,7 @@ trm_script="/usr/bin/travelmate.sh"
 
 boot()
 {
-    ubus -t 30 wait_for network.interface network.wireless hostapd.wlan0 2>/dev/null
+    ubus -t 30 wait_for network.interface network.wireless 2>/dev/null
     rc_procd start_service
 }
 

diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index a30b0cf6ecbcd438e7e8b0eb80b86aa68dd1eb6f..c591020177a2ded4568fc0da6a60c9fef44ad3b0 100755 (executable)
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -10,7 +10,7 @@
 #
 LC_ALL=C
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-trm_ver="0.8.1"
+trm_ver="0.8.2"
 trm_sysver="$(ubus -S call system board | jsonfilter -e '@.release.description')"
 trm_enabled=0
 trm_debug=0
@@ -22,16 +22,6 @@ trm_iwinfo="$(command -v iwinfo)"
 trm_radio=""
 trm_rtfile="/tmp/trm_runtime.json"
 
-# source required system libraries
-#
-if [ -r "/lib/functions.sh" ] && [ -r "/usr/share/libubox/jshn.sh" ]
-then
-    . "/lib/functions.sh"
-    . "/usr/share/libubox/jshn.sh"
-else
-    f_log "error" "system libraries not found"
-fi
-
 # f_envload: load travelmate environment
 #
 f_envload()
@@ -262,6 +252,16 @@ f_main()
     fi
 }
 
+# source required system libraries
+#
+if [ -r "/lib/functions.sh" ] && [ -r "/usr/share/libubox/jshn.sh" ]
+then
+    . "/lib/functions.sh"
+    . "/usr/share/libubox/jshn.sh"
+else
+    f_log "error" "system libraries not found"
+fi
+
 # handle different travelmate actions
 #
 f_envload