diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2012-04-13 12:33:46 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2012-04-13 12:33:46 -0400 |
| commit | 2db6137d7eb8d0ec7d0c1fb34e17dcb2f60b4f9d (patch) | |
| tree | dc6f1f8d75cc15e1e8b9a278d5b9efae4605c284 /gpsd.hotplug | |
| parent | 6e0db325ded2b6fbbefed4afce84d06a6fcaba23 (diff) | |
| download | gpsd-2db6137d7eb8d0ec7d0c1fb34e17dcb2f60b4f9d.tar.gz | |
Revert "Make it possible to pass in options via /etc/default/gpsd"
bzed says this will break modern Debian and Ubuntu installations by
stepping on the values of GPSD_OPTIONS and GPSD_SOCKET.
Diffstat (limited to 'gpsd.hotplug')
| -rw-r--r-- | gpsd.hotplug | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gpsd.hotplug b/gpsd.hotplug index 7aca86cd..dd0deafa 100644 --- a/gpsd.hotplug +++ b/gpsd.hotplug @@ -6,8 +6,7 @@ # ACTION = either "add" or "remove" # DEVNAME = the full name of the USB device that was just activated # -# It will accept from /etc/sysconfig/gpsd or /etc/default/gpsd -# the following config variables: +# It will accept from /etc/sysconfig/gpsd the following config variables: # # CONTROL_SOCKET = location of the gpsd control socket # OPTIONS = options to be passed to gpsd on launch @@ -25,8 +24,6 @@ export PATH if [ -r /etc/default/gpsd ]; then . /etc/default/gpsd - GPSD_OPTIONS=$OPTIONS - GPSD_SOCKET=$CONTROL_SOCKET elif [ -r /etc/sysconfig/gpsd ]; then . /etc/sysconfig/gpsd GPSD_OPTIONS=$OPTIONS |