From afff32107a4d6b70b833af55b273a2e58f276859 Mon Sep 17 00:00:00 2001 From: Corentin Lecouvey Date: Wed, 26 Jun 2013 15:52:03 +0200 Subject: Add systemd service to manage ConnMan NTP feature (#TZPC-1974) Both scripts were provided by Manolova, Plamena. --- 40-connman-ntp.list | 1 + connman-ntp.service | 12 ++++++++++++ packaging/connman.spec | 21 +++++++++++++-------- 3 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 40-connman-ntp.list create mode 100644 connman-ntp.service diff --git a/40-connman-ntp.list b/40-connman-ntp.list new file mode 100644 index 00000000..c608c941 --- /dev/null +++ b/40-connman-ntp.list @@ -0,0 +1 @@ +connman-ntp.serivice diff --git a/connman-ntp.service b/connman-ntp.service new file mode 100644 index 00000000..1978f743 --- /dev/null +++ b/connman-ntp.service @@ -0,0 +1,12 @@ +[Unit] +Description=Connman NTP service +After=syslog.target + +[Service] +Type=oneshot +ExecStart=/bin/bash -c "dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Clock.SetProperty string:'TimeUpdates' variant:string:'auto'" +ExecStop=/bin/bash -c "dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Clock.SetProperty string:'TimeUpdates' variant:string:'manual'" +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/packaging/connman.spec b/packaging/connman.spec index cb183121..a43baab2 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -7,6 +7,7 @@ Url: http://connman.net Group: Connectivity/Connection Management Source0: %{name}-%{version}.tar.xz Source1001: connman.manifest +BuildRequires: systemd BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libiptc) @@ -14,10 +15,7 @@ BuildRequires: pkgconfig(xtables) BuildRequires: pkgconfig(gnutls) BuildRequires: openconnect BuildRequires: readline-devel -Requires: systemd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%systemd_requires %description Connection Manager provides a daemon for managing Internet connections @@ -75,11 +73,14 @@ make %{?_smp_mflags} %install %make_install -mkdir -p %{buildroot}%{_unitdir}/network.target.wants -ln -s ../connman.service %{buildroot}%{_unitdir}/network.target.wants/connman.service +mkdir -p %{buildroot}/usr/lib/systemd/ntp-units.d +install -m644 40-connman-ntp.list %{buildroot}/usr/lib/systemd/ntp-units.d +install -m644 connman-ntp.service %{buildroot}%{_unitdir} +%install_service network.target.wants connman.service +%install_service network.target.wants connman-ntp.service %install_service multi-user.target.wants connman.service - +%install_service multi-user.target.wants connman-ntp.service %docs_package @@ -91,7 +92,11 @@ ln -s ../connman.service %{buildroot}%{_unitdir}/network.target.wants/connman.se %{_unitdir}/connman.service %{_unitdir}/network.target.wants/connman.service %{_unitdir}/multi-user.target.wants/connman.service - +%{_unitdir}/connman-ntp.service +%{_unitdir}/multi-user.target.wants/connman-ntp.service +%{_unitdir}/network.target.wants/connman-ntp.service +%dir /usr/lib/systemd/ntp-units.d +/usr/lib/systemd/ntp-units.d/40-connman-ntp.list %files test %{_libdir}/%{name}/test/* -- cgit v1.2.3