summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-01-12 12:06:51 -0600
committerJohn Klug <john.klug@multitech.com>2017-01-12 12:06:51 -0600
commite0dc5fbcf8465f710f9f2f64009d9f488b8a17bb (patch)
tree928050d9b76eb4f2aa56adf7defcdd48a7cabdfe
parent2d5497affdcc14c94b0038e908970e48d093d455 (diff)
downloadmeta-mlinux-e0dc5fbcf8465f710f9f2f64009d9f488b8a17bb.tar.gz
meta-mlinux-e0dc5fbcf8465f710f9f2f64009d9f488b8a17bb.tar.bz2
meta-mlinux-e0dc5fbcf8465f710f9f2f64009d9f488b8a17bb.zip
Do not change the baud rate if gpsd is already running
-rwxr-xr-xrecipes-navigation/gpsd/gpsd/gpsd6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-navigation/gpsd/gpsd/gpsd b/recipes-navigation/gpsd/gpsd/gpsd
index 9c59f10..e12d1c4 100755
--- a/recipes-navigation/gpsd/gpsd/gpsd
+++ b/recipes-navigation/gpsd/gpsd/gpsd
@@ -55,6 +55,9 @@ do_start()
if ((GPSD_NOSTART != 0)) ; then
exit 0
fi
+ /usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \
+ -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \
+ || return 1
# Return
# 0 if daemon has been started
# 1 if daemon was already running
@@ -66,9 +69,6 @@ do_start()
echo Expect a timeout error here. Need this error.
gpsctl -T 2 -f $GPS_LINE
stty -F $GPS_LINE $GPS_BAUD
- /usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \
- -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \
- || return 1
/usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
$GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \
|| return 2