diff options
| -rwxr-xr-x | recipes-connectivity/lora/lora-network-server/lora-network-server.init | 15 | ||||
| -rwxr-xr-x | recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init | 10 |
2 files changed, 14 insertions, 11 deletions
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 3c2764a..e2e376b 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -8,6 +8,7 @@ ENABLED="yes" [ -f /etc/default/$NAME ] && source /etc/default/$NAME +angel=/sbin/angel run_dir=/var/run/lora conf_dir=/var/config/lora @@ -339,10 +340,10 @@ do_start() { echo -n "Starting $NAME: " # start network server start-stop-daemon --start --background --make-pidfile \ - --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $net_server \ + --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $angel $net_server \ -c $conf_file --lora-eui $lora_eui --lora-hw-1 $lora_hw --lora-prod-1 $lora_id $lora_2_args \ --lora-path $run_dir \ - --noconsole 2>&1" + --noconsole" if [ "$no_lora_hw" != "true" ]; then # start packet forwarder @@ -351,17 +352,19 @@ do_start() { /usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \ --pidfile $pkt_fwd_pidfile --startas /bin/bash \ - -- -c "exec $pkt_fwd $pkt_fwd_options 2>&1" + -- -c "exec $angel $pkt_fwd $pkt_fwd_options" if [ "$dual_cards_installed" == "true" ]; then /usr/sbin/start-stop-daemon --chdir $run_dir/2 --start --background --make-pidfile \ --pidfile $pkt_fwd_2_pidfile --startas /bin/bash \ - -- -c "exec $pkt_fwd_2 $pkt_fwd_options -l $pkt_fwd_2_log" + -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options -l $pkt_fwd_2_log" fi fi - renice -n -20 -p $(pgrep lora-network-se) - renice -n -20 -p $(pgrep $(basename $pkt_fwd)) + renice -n -20 -p $(ps aux | grep angel | grep $(basename $pkt_fwd) | awk '{print $2}') &>/dev/null + renice -n -20 -p $(ps aux | grep angel | grep lora-net | awk '{print $2}') &>/dev/null + renice -n -20 -p $(pgrep $(basename $pkt_fwd)) &>/dev/null + renice -n -20 -p $(pgrep lora-network-se) &>/dev/null echo "OK" } diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init index 6320d2a..904737d 100755 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init @@ -4,6 +4,7 @@ NAME="lora-packet-forwarder" LOCK="/var/lock/$NAME" ENABLED="yes" +angel=/sbin/angel [ -f /etc/default/$NAME ] && source /etc/default/$NAME @@ -416,18 +417,17 @@ do_start() { echo -n "Starting $NAME: " /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options -l $pkt_fwd_log" + --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $angel $pkt_fwd $pkt_fwd_options -l $pkt_fwd_log" if [ "$dual_cards_installed" == "true" ]; then /usr/sbin/start-stop-daemon --chdir $run_dir/2 --start --background --make-pidfile \ --pidfile $pkt_fwd_2_pidfile --startas /bin/bash \ - -- -c "exec $pkt_fwd_2 $pkt_fwd_options -l $pkt_fwd_2_log" + -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options -l $pkt_fwd_2_log" fi - if [[ ! "$hw_id" =~ "$mtcdt3_id" ]]; then - renice -n -20 -p $(pgrep $(basename $pkt_fwd)) - fi + renice -n -20 -p $(ps aux | grep angel | grep $(basename $pkt_fwd) | awk '{print $2}') &>/dev/null + renice -n -20 -p $(pgrep $(basename $pkt_fwd)) &>/dev/null echo "OK" } |