Fix system controller startup

System controller startup depends on AUL services. The startup fails
if ico-system-controller.service is called before amd_ready flag is
set by AUL.

Add a systemd .path unit to wait until AUL is ready and call system
controller .service only after that.

Change-Id: Iae0e43a963a74d4a3ddf27f0bcca40b786327a18
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/data/lib/systemd/user/ico-system-controller.service b/data/lib/systemd/user/ico-system-controller.service
index 6e1f5ae..64551d8 100644 (file)
--- a/data/lib/systemd/user/ico-system-controller.service
+++ b/data/lib/systemd/user/ico-system-controller.service
@@ -6,7 +6,5 @@ Environment=TIZEN_PLATFORMLOGGING_MODE=1
 Environment=TIZEN_DLOG_LEVEL=1
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket
 Environment=XDG_RUNTIME_DIR=/run/user/5000
+Type=oneshot
 ExecStart=/usr/bin/launch_app org.tizen.ico.system-controller
-
-[Install]
-WantedBy=weston.target

diff --git a/data/lib/systemd/user/ico-uxf-wait-launchpad-ready.path b/data/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
new file mode 100644 (file)
index 0000000..e8cce6b
--- /dev/null
+++ b/data/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
@@ -0,0 +1,8 @@
+Description=Path activation for ico-system-controller
+
+[Path]
+PathExists=/tmp/amd_ready
+Unit=ico-system-controller.service
+
+[Install]
+WantedBy=weston.target

diff --git a/packaging/ico-uxf-homescreen.spec b/packaging/ico-uxf-homescreen.spec
index 09dc56f..ed36dd6 100644 (file)
--- a/packaging/ico-uxf-homescreen.spec
+++ b/packaging/ico-uxf-homescreen.spec
@@ -147,7 +147,8 @@ rm -f /home/app/layout.txt
 /usr/apps/org.tizen.ico.system-controller
 /usr/share/packages/org.tizen.ico.system-controller.xml
 /usr/lib/systemd/user/ico-system-controller.service
-/usr/lib/systemd/user/weston.target.wants/ico-system-controller.service
+/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
+/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
 
 %files system-controller-devel
 %defattr(-,root,root,-)

diff --git a/src/syscond/Makefile.am b/src/syscond/Makefile.am
index c16c941..ded2be7 100644 (file)
--- a/src/syscond/Makefile.am
+++ b/src/syscond/Makefile.am
@@ -64,8 +64,9 @@ install-exec-hook:
        install -m 0644 ../../data/share/packages/org.tizen.ico.system-controller.xml $(INSTALL_ROOT)/usr/share/packages
 
        install -m 0644 $(top_srcdir)/res/org.tizen.ico.system-controller/res/config/* $(INSTALL_ROOT)/usr/apps/org.tizen.ico.system-controller/res/config
+       install -m 0644 $(top_srcdir)/data/lib/systemd/user/ico-uxf-wait-launchpad-ready.path $(INSTALL_ROOT)/usr/lib/systemd/user
        install -m 0644 $(top_srcdir)/data/lib/systemd/user/ico-system-controller.service $(INSTALL_ROOT)/usr/lib/systemd/user
-       ln -sf ../ico-system-controller.service $(INSTALL_ROOT)/usr/lib/systemd/user/weston.target.wants
+       ln -sf ../ico-uxf-wait-launchpad-ready.path $(INSTALL_ROOT)/usr/lib/systemd/user/weston.target.wants