2 files changed, 3 insertions, 18 deletions
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
index 5c585d3..31499c1 100644
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
+++ b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
@@ -4,14 +4,14 @@ After=weston.service
 Requires=weston.service
 
 [Service]
-Type=forking
+Type=simple
 User=root
 PAMName=login
 Environment=WAYLAND_DISPLAY=/run/wayland-0
 Environment=@@application-environment@@
-ExecStart=/usr/bin/wayland-app-launch.sh
+ExecStart=@@wayland-application@@
 Restart=on-failure
 RestartSec=1
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=graphical.target
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in
deleted file mode 100644
index 87349aa..0000000
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.sh.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if test -z "$XDG_RUNTIME_DIR"; then
-    export XDG_RUNTIME_DIR=/run/user/`id -u`
-    if ! test -d "$XDG_RUNTIME_DIR"; then
-        mkdir --parents $XDG_RUNTIME_DIR
-        chmod 0700 $XDG_RUNTIME_DIR
-    fi
-fi
-
-# wait for weston
-while [ ! -e  $XDG_RUNTIME_DIR/wayland-0 ] ; do sleep 0.1; done
-sleep 1
-
-cd @@initial-path@@
-@@wayland-application@@ &