Skip wifi AP setup where unavailable. Add autopeer setting.

popura-network · Aug 18, 2020 · 883aa2a · 883aa2a
1 parent 769e9ce
commit 883aa2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/piratemodem-common/files/etc/uci-defaults/13_wifi b/piratemodem-common/files/etc/uci-defaults/13_wifi
@@ -1,4 +1,5 @@
 #!/bin/sh
+uci -q get wireless.radio0 > /dev/null || exit 0
 
 # create an isolated network for wireless ygg links
 uci -q batch << EOF

diff --git a/popura/files/yggdrasil.init b/popura/files/yggdrasil.init
@@ -4,17 +4,24 @@ START=90
 STOP=85
 
 USE_PROCD=1
+BIN_FILE="/usr/sbin/yggdrasil"
+CONFIG_FILE="/tmp/yggdrasil.conf"
+DAEMON_OPTS="-useconffile $CONFIG_FILE"
 
 start_service()
 {
 	[ -f /etc/uci-defaults/yggdrasil ] && ( . /etc/uci-defaults/yggdrasil )
 	# FIXME: Should wait until IPv6 link local addresses are available on br-lan
 	[ ! -f /tmp/.yggdrasil_started ] && ( touch /tmp/.yggdrasil_started && sleep 7 )
 
+        if [ "`uci -q get popura.@popura[0].autopeer`" != "0" ]; then
+            DAEMON_OPTS="$DAEMON_OPTS -autopeer"
+        fi
+        /usr/sbin/ygguci get | $BIN_FILE -useconf -normaliseconf -json > $CONFIG_FILE
+
 	procd_open_instance
 	procd_set_param respawn
-
-	procd_set_param command /bin/ash -c "ygguci get | yggdrasil -useconf -normaliseconf -json | yggdrasil -useconf -autopeer"
+	procd_set_param command $BIN_FILE $DAEMON_OPTS
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_close_instance