diff options
author | Sebastian Schmelzer | 2009-06-03 16:23:01 +0200 |
---|---|---|
committer | Sebastian Schmelzer | 2009-06-03 16:23:01 +0200 |
commit | 7d5ab955b441bafdd3a986ec1d9dcf87410d1c15 (patch) | |
tree | f06e377206627c4e31414849f7f089a0f5d86b07 /os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc | |
parent | small fix for kiosk plugin (diff) | |
download | core-7d5ab955b441bafdd3a986ec1d9dcf87410d1c15.tar.gz core-7d5ab955b441bafdd3a986ec1d9dcf87410d1c15.tar.xz core-7d5ab955b441bafdd3a986ec1d9dcf87410d1c15.zip |
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
Diffstat (limited to 'os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc')
-rw-r--r-- | os-plugins/plugins/kiosk/files/profiles/vmchooser/xinitrc | 9 |
1 files changed, 6 insertions, 3 deletions
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 |