diff options
| author | Paulo R. Zanoni <paulo@c3sl.ufpr.br> | 2008-08-26 06:59:42 -0300 |
|---|---|---|
| committer | Paulo R. Zanoni <paulo@c3sl.ufpr.br> | 2008-08-26 06:59:42 -0300 |
| commit | dff4b24c688e53d3705e897de046c5eff5afa9cd (patch) | |
| tree | 403e1294be5079983c1387a2a699e0b0ea507acc | |
| parent | d2faebd3f2bc1bdf8e6332d98601693016164b6a (diff) | |
Revert "Here, the variable XEPHYR_NUMBER is still used, for the same purposes."
This reverts commit 311d93f7892203d0758fdcdd4c8b9a6cdf44ab90.
| -rw-r--r-- | mdm/modes/xephyr-xdmcp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mdm/modes/xephyr-xdmcp b/mdm/modes/xephyr-xdmcp index e3d48f7..cdd21f0 100644 --- a/mdm/modes/xephyr-xdmcp +++ b/mdm/modes/xephyr-xdmcp @@ -79,26 +79,25 @@ function display_manager_start_seat () { # - $MY_XKB_LAYOUT and $MY_XKB_MODEL, for the keyboard associated with the # seat - echo "xephyr-wrapper :$XEPHYR_NUMBER -br" + echo "xephyr-wrapper :${SEAT_NUMBER} -br" echo " -parent $SEAT_WINDOW_ID" echo " -mouse evdev,,device=$MOUSE" echo " -keybd" echo -n " evdev,,device=$KEYBOARD,xkbmodel=$MY_XKB_MODEL," echo "xkblayout=$MY_XKB_LAYOUT" - echo " -${CONNECTION_TYPE} $CONNECTION_TARGET 2>&1 &" + echo " -${CONNECTION_TYPE} ${CONNECTION_TARGET} 2>&1 &" - $XEPHYR_WRAPPER :$XEPHYR_NUMBER -br \ - -parent $SEAT_WINDOW_ID \ - -mouse evdev,,device=$MOUSE \ - -keybd \ + $XEPHYR_WRAPPER :${SEAT_NUMBER} -br \ + -parent ${SEAT_WINDOW_ID} \ + -mouse evdev,,device=$MOUSE \ + -keybd \ evdev,,device=$KEYBOARD,xkbmodel=$MY_XKB_MODEL,xkblayout=$MY_XKB_LAYOUT \ - -${CONNECTION_TYPE} $CONNECTION_TARGET 2>&1 & + -${CONNECTION_TYPE} ${CONNECTION_TARGET} 2>&1 & PID=$! - echo $PID > $MDM_PIDS/Xephyr.${XEPHYR_NUMBER}.pid + echo $PID > $MDM_PIDS/Xephyr.${SEAT_NUMBER}.pid wait $PID - rm -f $MDM_PIDS/xephyr-xdmcp-Xephyr.${XEPHYR_NUMBER}.pid - + rm -f $MDM_PIDS/xephyr-xdmcp-Xephyr.${SEAT_NUMBER}.pid } function display_manager_stop () { |