diff options
| author | Mikko Ylinen <mikko.ylinen@intel.com> | 2013-10-07 12:54:08 +0300 |
|---|---|---|
| committer | Mikko Ylinen <mikko.ylinen@intel.com> | 2013-10-07 12:54:08 +0300 |
| commit | d9bbfd7f3a02bb3c02947cf06cf43ff93d888de6 (patch) | |
| tree | f69932a73d36e11720c9abdc33f74a903d48d6cb | |
| parent | 7f819a0f704aa17d087c8dcf5d6871fd4cf80ec9 (diff) | |
| download | neard-d9bbfd7f3a02bb3c02947cf06cf43ff93d888de6.tar.gz neard-d9bbfd7f3a02bb3c02947cf06cf43ff93d888de6.tar.bz2 neard-d9bbfd7f3a02bb3c02947cf06cf43ff93d888de6.zip | |
Revert "Fix issue TIVI-1665: [3.0] The neard service is not enabled by default"
NFC chips are not present on all systems. Trying to run neard on such a
system causes neard to fail. This unnecessarily adds boot time.
This reverts commit ab3f78af5bc38ad8f47ff1a17b4c4d29813299de.
Change-Id: I7ce3a29626af40a3b352fbd3347d52d52b185cc3
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
| -rw-r--r-- | packaging/neard.changes | 3 | ||||
| -rw-r--r-- | packaging/neard.spec | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/packaging/neard.changes b/packaging/neard.changes index a737815..7fc6ba0 100644 --- a/packaging/neard.changes +++ b/packaging/neard.changes @@ -1,6 +1,3 @@ -* Sat Sep 14 CST 2013 Chengyi Zhao <chengyi1.zhao@archermind.com> - 0.12 -- Fix issue TIVI-1665: [3.0] The neard service is not enabled by default - * Mon Jul 8 17:02:59 CST 2013 Arron <arron.wang@intel.com> - 0.12 - rebase to version 0.12 diff --git a/packaging/neard.spec b/packaging/neard.spec index 9fb25ec..ce558e0 100644 --- a/packaging/neard.spec +++ b/packaging/neard.spec @@ -64,9 +64,8 @@ make %{?jobs:-j%jobs} install -d %{buildroot}%{_libdir}/systemd/system/ install -m 644 %{S:1} %{buildroot}%{_libdir}/systemd/system/neard.service install -d %{buildroot}%{_libdir}/systemd/system/network.target.wants/ -install -d %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/ ln -s ../neard.service %{buildroot}%{_libdir}/systemd/system/network.target.wants/neard.service -ln -s ../neard.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/neard.service + mkdir -p %{buildroot}%{_sysconfdir}/neard cp src/main.conf %{buildroot}%{_sysconfdir}/neard/main.conf @@ -90,7 +89,6 @@ systemctl daemon-reload %config %{_sysconfdir}/dbus-1/system.d/org.neard.conf %{_libdir}/systemd/system/neard.service %{_libdir}/systemd/system/network.target.wants/neard.service -%{_libdir}/systemd/system/multi-user.target.wants/neard.service %files devel %manifest %{name}.manifest |