tizen: Disable restarting display-manager.service

display-manager is VIP, meaning its failure has to cause
system reboot.  However, current faultd logic waits for
service to enter failed state before system gets restarted.

Without this patch display-manager never enters failed state
as systemd does not place restartable services in failed state
unless it reaches JobTimeoutSec+StartLimitBurst limits.

This patch disables restart logic in display-manager for above
reason.

Change-Id: I945601caf2b31f0103b09e0d271919b5807e3d6d
Signed-off-by: Karol Lewandowski <k.lewandowsk@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 6b73bba0fc8b8728553ee5f3498c5c97cef6779d..02c8b9069e462108c330b5e7b909f811ee9b778c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,8 @@ faultd_DEPENDENCIES = $(ENABLED_MODULES)
 
 install-data-local:
        $(MKDIR_P) $(DESTDIR)$(dbdir)
+       $(MKDIR_P) $(DESTDIR)$(unitdir)/display-manager.service.d
+       $(INSTALL) systemd-service.d/display-manager.service.conf $(DESTDIR)/$(unitdir)/display-manager.service.d/faultd.conf
 
 if BUILD_TEST_PROGRAMS
 bin_PROGRAMS = leaker

diff --git a/packaging/faultd.spec b/packaging/faultd.spec
index 97e63638a8595bd5a583a48f9086fcdb07911539..34f7d97e9108fd800cc2f4da9ce6935f42a324ee 100644 (file)
--- a/packaging/faultd.spec
+++ b/packaging/faultd.spec
@@ -50,6 +50,7 @@ ln -s ../faultd.service %{buildroot}/%{_unitdir}/multi-user.target.wants
 %{_sysconfdir}/faultd/conf.d/display-manager.service.conf
 %{_unitdir}/faultd.service
 %{_unitdir}/multi-user.target.wants/faultd.service
+%{_unitdir}/display-manager.service.d/faultd.conf
 
 %files test-programs
 %{_bindir}/leaker

diff --git a/systemd-service.d/display-manager.service.conf b/systemd-service.d/display-manager.service.conf
new file mode 100644 (file)
index 0000000..3de2669
--- /dev/null
+++ b/systemd-service.d/display-manager.service.conf
@@ -0,0 +1,2 @@
+[Service]
+Restart=no