vapier 14/10/30 21:20:36 Modified: gpsd.init-2 Added: gpsd-3.11-hotplug-config.patch Log: Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.3 sci-geosciences/gpsd/files/gpsd.init-2 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2?r1=1.2&r2=1.3 Index: gpsd.init-2 =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gpsd.init-2 30 Sep 2010 23:07:55 -0000 1.2 +++ gpsd.init-2 30 Oct 2014 21:20:36 -0000 1.3 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.2 2010/09/30 23:07:55 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/files/gpsd.init-2,v 1.3 2014/10/30 21:20:36 vapier Exp $ depend() { after dbus @@ -12,6 +12,7 @@ DAEMON=/usr/sbin/gpsd checkconfig() { + # Note: these GPSD_xxx var names should be kept in sync with the udev rules. if [ -z "${GPSD_SOCKET}" ] && [ -z "${DEVICES}" ]; then GPSD_SOCKET="/var/run/gpsd.sock" fi 1.1 sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch?rev=1.1&view=markup 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 Index: gpsd-3.11-hotplug-config.patch =================================================================== https://bugs.gentoo.org/511584 >From 2c0c2d90cbe450d208b320359b55089a441ff52a Mon Sep 17 00:00:00 2001 From: Mike Frysinger <[email protected]> Date: Thu, 30 Oct 2014 17:17:41 -0400 Subject: [PATCH] udev rules: source Gentoo config files --- gpsd.hotplug | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gpsd.hotplug b/gpsd.hotplug index dd0deaf..5f4ce13 100644 --- a/gpsd.hotplug +++ b/gpsd.hotplug @@ -24,6 +24,8 @@ export PATH if [ -r /etc/default/gpsd ]; then . /etc/default/gpsd +elif [ -r /etc/conf.d/gpsd ]; then + . /etc/conf.d/gpsd elif [ -r /etc/sysconfig/gpsd ]; then . /etc/sysconfig/gpsd GPSD_OPTIONS=$OPTIONS -- 2.1.2
