From 2991a162f6e28420fc2678c993e51204e113e480 Mon Sep 17 00:00:00 2001 From: "Bocklage, Jens" <Jens_Bocklage@mentor.com> Date: Wed, 23 Nov 2016 16:29:32 +0100 Subject: Systemd service files rework Fixed dbus interfaces names. Fixed Requires and After. Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com> --- HomeScreen/conf/HomeScreen.service | 8 +++++--- .../conf/HomeScreenAppFrameworkBinderAGL.service | 11 +++++++---- InputEventManager/conf/InputEventManager.service | 11 +++++++---- WindowManager/conf/WindowManager.service | 10 ++++++---- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/HomeScreen/conf/HomeScreen.service b/HomeScreen/conf/HomeScreen.service index a343d1e..3de7fff 100644 --- a/HomeScreen/conf/HomeScreen.service +++ b/HomeScreen/conf/HomeScreen.service @@ -1,16 +1,18 @@ [Unit] Description=AGL reference HomeScreen -After=WindowManager.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service +Requires=dbus.service afm-user-daemon.service WindowManager.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service +After=dbus.service afm-user-daemon.service WindowManager.service InputEventManager.service HomeScreenAppFrameworkBinderAGL.service +ConditionKernelCommandLine=!agl.nogfx [Service] +User=root Type=dbus BusName=org.agl.homescreen ExecStart=/usr/AGL/HomeScreen/HomeScreen -Environment=QT_IVI_SURFACE_ID=1000 QT_WAYLAND_SHELL_INTEGRATION="ivi-shell" LD_PRELOAD=/usr/lib/libEGL.so +Environment=QT_IVI_SURFACE_ID=1000 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell LD_PRELOAD=/usr/lib/libEGL.so Restart=on-failure RestartSec=5 - [Install] WantedBy=default.target diff --git a/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service b/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service index 8375912..a158b94 100644 --- a/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service +++ b/HomeScreenAppFrameworkBinderAGL/conf/HomeScreenAppFrameworkBinderAGL.service @@ -1,14 +1,17 @@ [Unit] Description=AGL App Framework Binder for HomeScreen +Requires=dbus.service afm-user-daemon.service +After=afm-user-daemon.service +ConditionKernelCommandLine=!agl.nogfx [Service] -Type=dbus -BusName=org.agl.appframework -ExecStart=/usr/AGL/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL +User=root +Type=dbus +BusName=org.agl.homescreenappframeworkbinder +ExecStart=/usr/AGL/HomeScreen/HomeScreenAppFrameworkBinderAGL Restart=on-failure RestartSec=5 - [Install] WantedBy=default.target diff --git a/InputEventManager/conf/InputEventManager.service b/InputEventManager/conf/InputEventManager.service index 4db78bb..cfb4431 100644 --- a/InputEventManager/conf/InputEventManager.service +++ b/InputEventManager/conf/InputEventManager.service @@ -1,14 +1,17 @@ [Unit] Description=AGL Input Event Manager +Requires=dbus.service +After=dbus.service +ConditionKernelCommandLine=!agl.nogfx [Service] -Type=dbus -BusName=org.agl.inputevent -ExecStart=/usr/AGL/InputEventManager/InputEventManager +User=root +Type=dbus +BusName=org.agl.inputeventmanager +ExecStart=/usr/AGL/HomeScreen/InputEventManager Restart=on-failure RestartSec=5 - [Install] WantedBy=default.target diff --git a/WindowManager/conf/WindowManager.service b/WindowManager/conf/WindowManager.service index b44e14e..d541635 100644 --- a/WindowManager/conf/WindowManager.service +++ b/WindowManager/conf/WindowManager.service @@ -1,14 +1,16 @@ [Unit] Description=AGL Window Manager -After=weston.service +Requires=dbus.service +ConditionKernelCommandLine=!agl.nogfx [Service] -Type=dbus +User=root +Type=dbus BusName=org.agl.windowmanager -ExecStart=/usr/AGL/WindowManager/WindowManager +ExecStart=/usr/AGL/HomeScreen/WindowManager Restart=on-failure RestartSec=5 - +StandardOutput=tty [Install] WantedBy=default.target -- cgit