diff options
| -rwxr-xr-x | scripts/shell/start-sugar | 8 | ||||
| -rw-r--r-- | scripts/xinitrc | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/scripts/shell/start-sugar b/scripts/shell/start-sugar index 5408a43..3ac2f09 100755 --- a/scripts/shell/start-sugar +++ b/scripts/shell/start-sugar @@ -6,7 +6,13 @@ rootdir=`dirname "$scriptsdir"` display=`$scriptsdir/find-free-display` if [ -f $rootdir/config ]; then - source $rootdir/config + source $rootdir/config +fi + +if [ -n $SUGAR_DISPLAY ]; then + SUGAR_XKBCONFIG=`mktemp -t sugar-xkbconfig-XXXXXX` + setxkbmap -print > $SUGAR_XKBCONFIG + export SUGAR_XKBCONFIG fi if [ ! -z $SUGAR_PROFILE ]; then diff --git a/scripts/xinitrc b/scripts/xinitrc index cdf3268..9dfc388 100644 --- a/scripts/xinitrc +++ b/scripts/xinitrc @@ -47,6 +47,11 @@ elif [ ! -z $PROFILE ]; then export SUGAR_PROFILE=$PROFILE fi +if [ -n $SUGAR_XKBCONFIG ]; then + cat $SUGAR_XKBCONFIG | xkbcomp - $DISPLAY 2> /dev/null + rm $SUGAR_XKBCONFIG +fi + JHBUILD="$ROOT_DIR/install/bin/jhbuild -f $ROOT_DIR/scripts/jhbuildrc" RUN_COMMAND="dbus-launch --exit-with-session $SCRIPTS_DIR/run-with-keyring sugar" |