| 1 |
vapier 14/10/30 21:20:36 |
| 2 |
|
| 3 |
Modified: gpsd.init-2 |
| 4 |
Added: gpsd-3.11-hotplug-config.patch |
| 5 |
Log: |
| 6 |
Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner. |
| 7 |
|
| 8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.3 sci-geosciences/gpsd/files/gpsd.init-2 |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?rev=1.3&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?rev=1.3&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?r1=1.2&r2=1.3 |
| 16 |
|
| 17 |
Index: gpsd.init-2 |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v |
| 20 |
retrieving revision 1.2 |
| 21 |
retrieving revision 1.3 |
| 22 |
diff -u -r1.2 -r1.3 |
| 23 |
--- gpsd.init-2 30 Sep 2010 23:07:55 -0000 1.2 |
| 24 |
+++ gpsd.init-2 30 Oct 2014 21:20:36 -0000 1.3 |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
-# Copyright 1999-2010 Gentoo Foundation |
| 28 |
+# Copyright 1999-2014 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.2 2010/09/30 23:07:55 swegener Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.3 2014/10/30 21:20:36 vapier Exp $ |
| 32 |
|
| 33 |
depend() { |
| 34 |
after dbus |
| 35 |
@@ -12,6 +12,7 @@ |
| 36 |
DAEMON=/usr/sbin/gpsd |
| 37 |
|
| 38 |
checkconfig() { |
| 39 |
+ # Note: these GPSD_xxx var names should be kept in sync with the udev rules. |
| 40 |
if [ -z "${GPSD_SOCKET}" ] && [ -z "${DEVICES}" ]; then |
| 41 |
GPSD_SOCKET="/var/run/gpsd.sock" |
| 42 |
fi |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: gpsd-3.11-hotplug-config.patch |
| 52 |
=================================================================== |
| 53 |
https://bugs.gentoo.org/511584 |
| 54 |
|
| 55 |
From 2c0c2d90cbe450d208b320359b55089a441ff52a Mon Sep 17 00:00:00 2001 |
| 56 |
From: Mike Frysinger <vapier@g.o> |
| 57 |
Date: Thu, 30 Oct 2014 17:17:41 -0400 |
| 58 |
Subject: [PATCH] udev rules: source Gentoo config files |
| 59 |
|
| 60 |
--- |
| 61 |
gpsd.hotplug | 2 ++ |
| 62 |
1 file changed, 2 insertions(+) |
| 63 |
|
| 64 |
diff --git a/gpsd.hotplug b/gpsd.hotplug |
| 65 |
index dd0deaf..5f4ce13 100644 |
| 66 |
--- a/gpsd.hotplug |
| 67 |
+++ b/gpsd.hotplug |
| 68 |
@@ -24,6 +24,8 @@ export PATH |
| 69 |
|
| 70 |
if [ -r /etc/default/gpsd ]; then |
| 71 |
. /etc/default/gpsd |
| 72 |
+elif [ -r /etc/conf.d/gpsd ]; then |
| 73 |
+ . /etc/conf.d/gpsd |
| 74 |
elif [ -r /etc/sysconfig/gpsd ]; then |
| 75 |
. /etc/sysconfig/gpsd |
| 76 |
GPSD_OPTIONS=$OPTIONS |
| 77 |
-- |
| 78 |
2.1.2 |
Archives