From 5d3116415c4f040d21758322a02c3265f2d157dd Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan.griffiths@canonical.com>
Date: Fri, 19 Jan 2018 18:41:33 +0000
Subject: [PATCH] [miral-desktop] pass user environment settings (like
 MIR_EXPERIMENTAL_XDG_SHELL) to the server

---
 examples/miral-shell/miral-desktop.sh | 3 +--
 tests/acceptance-tests/wayland/wlcs   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/miral-shell/miral-desktop.sh b/examples/miral-shell/miral-desktop.sh
index d9cf29a7f3..9dd355293d 100755
--- a/examples/miral-shell/miral-desktop.sh
+++ b/examples/miral-shell/miral-desktop.sh
@@ -40,9 +40,8 @@ if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland end
 vt_login_session=$(who -u | grep tty${vt} | grep ${USER} | wc -l)
 if [ "${vt_login_session}" == "0" ]; then echo "Error: please log into tty${vt} first"; exit 1 ;fi
 
-sudo ls >> /dev/null
 oldvt=$(sudo fgconsole)
-sudo sh -c "LD_LIBRARY_PATH=${LD_LIBRARY_PATH} XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR} ${bindir}${miral_server} --wayland-socket-name ${wayland_display} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"&
+sudo --background --preserve-env sh -c "${bindir}${miral_server} --wayland-socket-name ${wayland_display} --vt ${vt} --arw-file --file ${socket} $*; chvt ${oldvt}"
 
 while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
 
diff --git a/tests/acceptance-tests/wayland/wlcs b/tests/acceptance-tests/wayland/wlcs
index 393082b1e4..acb3e9f6fe 160000
--- a/tests/acceptance-tests/wayland/wlcs
+++ b/tests/acceptance-tests/wayland/wlcs
@@ -1 +1 @@
-Subproject commit 393082b1e44eb8e75dc30ee5b24b7be1bcbfd285
+Subproject commit acb3e9f6feacf991069d3581cb8fb088bff45aac