[gpsd] use systemd socket activation (#909563)
Miroslav Lichvar
mlichvar at fedoraproject.org
Wed Dec 4 08:27:32 UTC 2013
commit 0f0aab2aab114b9e3d87893d8964aefe9f263f5f
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Mon Dec 2 19:59:42 2013 +0100
use systemd socket activation (#909563)
gpsd.service | 3 ++-
gpsd.spec | 7 +++++--
gpsd.sysconfig | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gpsd.service b/gpsd.service
index 1f20e3e..edc9e05 100644
--- a/gpsd.service
+++ b/gpsd.service
@@ -5,7 +5,8 @@ After=chronyd.service
[Service]
EnvironmentFile=-/etc/sysconfig/gpsd
-ExecStart=/usr/sbin/gpsd -F /var/run/gpsd.sock -N $OPTIONS $DEVICE
+ExecStart=/usr/sbin/gpsd -N $OPTIONS
[Install]
WantedBy=multi-user.target
+Also=gpsd.socket
diff --git a/gpsd.spec b/gpsd.spec
index 952eb6c..48d1737 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -118,6 +118,8 @@ DESTDIR=%{buildroot} scons install
%{__install} -d -m 0755 %{buildroot}%{_unitdir}
%{__install} -p -m 0644 %{SOURCE10} \
%{buildroot}%{_unitdir}/gpsd.service
+%{__install} -p -m 0644 systemd/gpsd.socket \
+ %{buildroot}%{_unitdir}/gpsd.socket
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
%{__install} -p -m 0644 %{SOURCE11} \
@@ -163,10 +165,10 @@ do
done
%post
-%systemd_post gpsd.service
+%systemd_post gpsd.service gpsd.socket
%preun
-%systemd_preun gpsd.service
+%systemd_preun gpsd.service gpsd.socket
%postun
# Don't restart the service
@@ -186,6 +188,7 @@ done
%{_bindir}/gpsmon
%{_bindir}/gpsctl
%{_unitdir}/gpsd.service
+%{_unitdir}/gpsd.socket
%{_udevrulesdir}/*.rules
%{_prefix}/lib/udev/gpsd*
%{_mandir}/man8/gpsd.8*
diff --git a/gpsd.sysconfig b/gpsd.sysconfig
index 3f21e33..2d840c0 100644
--- a/gpsd.sysconfig
+++ b/gpsd.sysconfig
@@ -1,3 +1,4 @@
+# Options for gpsd, including serial devices
OPTIONS=""
-DEVICE="/dev/ttyUSB0"
+# Set to 'true' to add USB devices automatically via udev
USBAUTO="true"
More information about the scm-commits
mailing list