Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[systemd] Start sensord in graphical target instead of basic. Contrib…
…utes to JB#20442

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
mkosola committed Dec 10, 2014
1 parent 95e5b49 commit eca3eef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
9 changes: 5 additions & 4 deletions rpm/sensord.service
@@ -1,17 +1,18 @@
[Unit]
Description=Sensor daemon for sensor framework
After=boardname.service
Requires=dbus.socket
After=dbus.socket
Requires=dbus.service
Conflicts=actdead.target

[Service]
Type=forking
Type=forking
BusName=com.nokia.SensorService
ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
ExecStart=/usr/sbin/sensord -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
RestartSec=1

[Install]
WantedBy=basic.target
WantedBy=graphical.target

11 changes: 6 additions & 5 deletions rpm/sensorfw-qt5.spec
Expand Up @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(mlite5)
BuildRequires: systemd
Provides: sensord-qt5
Obsoletes: sensorframework

Expand Down Expand Up @@ -91,11 +92,11 @@ rm -rf %{buildroot}
export QT_SELECT=5
%qmake5_install

install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_lib}/systemd/system/sensord.service
install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/sensord.service
install -D -m750 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/sensord-daemon-conf-setup

mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants
ln -s ../sensord.service %{buildroot}/%{_lib}/systemd/system/basic.target.wants/sensord.service
mkdir -p %{buildroot}/%{_unitdir}/graphical.target.wants
ln -s ../sensord.service %{buildroot}/%{_unitdir}/graphical.target.wants/sensord.service

%preun
if [ "$1" -eq 0 ]; then
Expand Down Expand Up @@ -127,8 +128,8 @@ systemctl daemon-reload || :
%config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
%config %{_sysconfdir}/sensorfw/sensord.conf
%dir %{_sysconfdir}/sensorfw/sensord.conf.d/
/%{_lib}/systemd/system/sensord.service
/%{_lib}/systemd/system/basic.target.wants/sensord.service
%{_unitdir}/sensord.service
%{_unitdir}/graphical.target.wants/sensord.service
%{_bindir}/sensord-daemon-conf-setup

%files devel
Expand Down

0 comments on commit eca3eef

Please sign in to comment.