[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd.init gpsd.conf

[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd.init gpsd.conf

[Steve Arnold (nerdboy)]

nerdboy     09/08/23 00:01:40

  Modified:             gpsd.init gpsd.conf
  Log:
  Updated init and conf files for bug #281705.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sci-geosciences/gpsd/files/gpsd.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?r1=1.6&r2=1.7

Index: gpsd.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpsd.init	11 Jun 2007 03:04:29 -0000	1.6
+++ gpsd.init	23 Aug 2009 00:01:40 -0000	1.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.6 2007/06/11 03:04:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # You can use this init script to manage a serial port GPS or other
 # non-hotplug device (or any device for that matter).  By design,
@@ -22,14 +22,14 @@
 start() {
 	checkconfig || return 1
 	ebegin "Starting gpsd"
-	touch /var/run/gpsd.pid
-	/usr/sbin/gpsd ${GPSD_OPTS} ${GPS_DEV}
+	start-stop-daemon --start --quiet --exec /usr/sbin/gpsd \
+		-- ${GPSD_OPTS} ${GPS_DEV}
 	eend $? "Failed to start gpsd"
 }
 
 stop() {
 	ebegin "Stopping gpsd"
-	killall -q gpsd >/dev/null
+	start-stop-daemon --stop --quiet --pidfile /var/run/gpsd.pid
 	eend $? "Failed to stop gpsd"
 	rm -f /var/run/gpsd.pid
 }



1.7                  sci-geosciences/gpsd/files/gpsd.conf

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?r1=1.6&r2=1.7

Index: gpsd.conf
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gpsd.conf	23 Feb 2008 20:03:59 -0000	1.6
+++ gpsd.conf	23 Aug 2009 00:01:40 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.6 2008/02/23 20:03:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.7 2009/08/23 00:01:40 nerdboy Exp $
 
 # Config file for gpsd server
 
@@ -8,21 +8,19 @@
 # setup for USB/Serial, Garmin, or other, however, without hotplug,
 # gpsd still needs to have the device set on the commandline.
 
-# Set GPS_DEV to the device to be used by the gpsd server.
-# This device must have the group tty and be writable (see
-# the INSTALL file in the docs).
+# A device may be a local serial device for GPS input, or a URL of 
+# the form:
+#      [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]
+# in which case it specifies an input source for DGPS or ntrip data.
+# Set GPS_DEV to the device to be used by the gpsd server (see the
+# INSTALL file in the docs for more info).  Run gpsd -h to see a list
+# supported driver types (most are enabled by default).
 
 # This example is for a Deluo GPS Serial/USB converter dongle, really
 # a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels.
 # The normal udev config provides the correct /dev/ttyUSB0 device.
-# The second example is just a normal serial port...
 
-#GPS_DEV="/dev/ttyUSB0"
+GPS_DEV="/dev/ttyUSB0"
 
-#GPS_DEV="/dev/ttyS0
-
-# Use the following for gpsd with ntp instead of the older one below
-#GPSD_OPTS="-n ${GPS_DEV}"
-
-GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock"
+GPSD_OPTS="-b -n -P /var/run/gpsd.pid -F /var/run/gpsd.sock"