From 71e2fa03b457a51fc54587f557cd8e8d52c25837 Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Wed, 7 Dec 2016 11:34:51 -0600 Subject: lora: supporess global_conf.json diff output, pass lora card hw and prod id info to network server --- .../lora/lora-network-server/lora-network-server.init | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes-connectivity/lora/lora-network-server') diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init index 726aec5..c3b332d 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -61,7 +61,7 @@ card_found() { ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd fi - diff $GLOBAL_CONF /opt/lora/global_conf.json + diff $GLOBAL_CONF /opt/lora/global_conf.json &>/dev/null if [ $? -ne 0 ]; then cp $GLOBAL_CONF /opt/lora/global_conf.json fi @@ -74,6 +74,7 @@ card_found() { do_start() { + mkdir -p $run_dir/1 read_card_info @@ -93,7 +94,8 @@ do_start() { # start network server start-stop-daemon --start --background --make-pidfile \ --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $net_server \ - -c $conf_file --lora-eui $lora_eui --lora-path $run_dir --db $conf_db \ + -c $conf_file --lora-eui $lora_eui --lora-prod-1 $lora_id --lora-hw-1 $lora_hw \ + --lora-path $run_dir --db $conf_db \ --noconsole -l $net_server_log >> $net_server_log 2>&1" sleep 2 # start packet forwarder -- cgit v1.2.3