1 |
nerdboy 09/08/23 00:01:40 |
2 |
|
3 |
Modified: gpsd.init gpsd.conf |
4 |
Log: |
5 |
Updated init and conf files for bug #281705. |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 sci-geosciences/gpsd/files/gpsd.init |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: gpsd.init |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -u -r1.6 -r1.7 |
21 |
--- gpsd.init 11 Jun 2007 03:04:29 -0000 1.6 |
22 |
+++ gpsd.init 23 Aug 2009 00:01:40 -0000 1.7 |
23 |
@@ -1,7 +1,7 @@ |
24 |
#!/sbin/runscript |
25 |
# Copyright 1999-2004 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.6 2007/06/11 03:04:29 nerdboy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init,v 1.7 2009/08/23 00:01:40 nerdboy Exp $ |
29 |
|
30 |
# You can use this init script to manage a serial port GPS or other |
31 |
# non-hotplug device (or any device for that matter). By design, |
32 |
@@ -22,14 +22,14 @@ |
33 |
start() { |
34 |
checkconfig || return 1 |
35 |
ebegin "Starting gpsd" |
36 |
- touch /var/run/gpsd.pid |
37 |
- /usr/sbin/gpsd ${GPSD_OPTS} ${GPS_DEV} |
38 |
+ start-stop-daemon --start --quiet --exec /usr/sbin/gpsd \ |
39 |
+ -- ${GPSD_OPTS} ${GPS_DEV} |
40 |
eend $? "Failed to start gpsd" |
41 |
} |
42 |
|
43 |
stop() { |
44 |
ebegin "Stopping gpsd" |
45 |
- killall -q gpsd >/dev/null |
46 |
+ start-stop-daemon --stop --quiet --pidfile /var/run/gpsd.pid |
47 |
eend $? "Failed to stop gpsd" |
48 |
rm -f /var/run/gpsd.pid |
49 |
} |
50 |
|
51 |
|
52 |
|
53 |
1.7 sci-geosciences/gpsd/files/gpsd.conf |
54 |
|
55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?rev=1.7&view=markup |
56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?rev=1.7&content-type=text/plain |
57 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf?r1=1.6&r2=1.7 |
58 |
|
59 |
Index: gpsd.conf |
60 |
=================================================================== |
61 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v |
62 |
retrieving revision 1.6 |
63 |
retrieving revision 1.7 |
64 |
diff -u -r1.6 -r1.7 |
65 |
--- gpsd.conf 23 Feb 2008 20:03:59 -0000 1.6 |
66 |
+++ gpsd.conf 23 Aug 2009 00:01:40 -0000 1.7 |
67 |
@@ -1,6 +1,6 @@ |
68 |
# Copyright 1999-2005 Gentoo Foundation |
69 |
# Distributed under the terms of the GNU General Public License v2 |
70 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.6 2008/02/23 20:03:59 nerdboy Exp $ |
71 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.conf,v 1.7 2009/08/23 00:01:40 nerdboy Exp $ |
72 |
|
73 |
# Config file for gpsd server |
74 |
|
75 |
@@ -8,21 +8,19 @@ |
76 |
# setup for USB/Serial, Garmin, or other, however, without hotplug, |
77 |
# gpsd still needs to have the device set on the commandline. |
78 |
|
79 |
-# Set GPS_DEV to the device to be used by the gpsd server. |
80 |
-# This device must have the group tty and be writable (see |
81 |
-# the INSTALL file in the docs). |
82 |
+# A device may be a local serial device for GPS input, or a URL of |
83 |
+# the form: |
84 |
+# [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream] |
85 |
+# in which case it specifies an input source for DGPS or ntrip data. |
86 |
+# Set GPS_DEV to the device to be used by the gpsd server (see the |
87 |
+# INSTALL file in the docs for more info). Run gpsd -h to see a list |
88 |
+# supported driver types (most are enabled by default). |
89 |
|
90 |
# This example is for a Deluo GPS Serial/USB converter dongle, really |
91 |
# a pl2303 chip - CONFIG_USB_SERIAL_PL2303 in modern 2.6 kernels. |
92 |
# The normal udev config provides the correct /dev/ttyUSB0 device. |
93 |
-# The second example is just a normal serial port... |
94 |
|
95 |
-#GPS_DEV="/dev/ttyUSB0" |
96 |
+GPS_DEV="/dev/ttyUSB0" |
97 |
|
98 |
-#GPS_DEV="/dev/ttyS0 |
99 |
- |
100 |
-# Use the following for gpsd with ntp instead of the older one below |
101 |
-#GPSD_OPTS="-n ${GPS_DEV}" |
102 |
- |
103 |
-GPSD_OPTS="-P /var/run/gpsd.pid -f GPS0 -F /var/run/gpsd.sock" |
104 |
+GPSD_OPTS="-b -n -P /var/run/gpsd.pid -F /var/run/gpsd.sock" |