From 7d5ab955b441bafdd3a986ec1d9dcf87410d1c15 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Wed, 3 Jun 2009 14:23:01 +0000
Subject: fix for gconf sanity check error; include xsession script generated
 by profile plugin into .xinitrc

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2917 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'os-plugins/plugins/kiosk')

diff --git a/os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc b/os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc
index 9f760789..7774f4d2 100644
--- a/os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc
+++ b/os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc
@@ -1,4 +1,7 @@
-#!/bin/sh
+# check if we need to include Xsession script generated by out profile
+# plugin
+[ -e /etc/X11/Xsession.d/10slx-home_env ] && \
+   . /etc/X11/Xsession.d/10slx-home_env 
 
-xsetroot -bg navy
-/opt/openslx/plugin-repo/vmchooser/vmchooser -p /dev/null
+/usr/bin/xsetroot -solid navy
+/opt/openslx/plugin-repo/vmchooser/vmchooser -p /dev/null
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522