summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorARAMIS STACH HAIDUSKI FERNANDES <aramis@guinness.c3sl.ufpr.br>2008-08-25 17:47:27 -0300
committerARAMIS STACH HAIDUSKI FERNANDES <aramis@guinness.c3sl.ufpr.br>2008-08-25 17:47:27 -0300
commit311d93f7892203d0758fdcdd4c8b9a6cdf44ab90 (patch)
tree6a816928aa238153b8db61118ca6b603bb0f3dd5
parent423f08ba9e6e82763cdd252b6f2a9a0e52860b91 (diff)
Here, the variable XEPHYR_NUMBER is still used, for the same purposes.
-rw-r--r--mdm/modes/xephyr-xdmcp19
1 files changed, 10 insertions, 9 deletions
diff --git a/mdm/modes/xephyr-xdmcp b/mdm/modes/xephyr-xdmcp
index cdd21f0..e3d48f7 100644
--- a/mdm/modes/xephyr-xdmcp
+++ b/mdm/modes/xephyr-xdmcp
@@ -79,25 +79,26 @@ function display_manager_start_seat () {
# - $MY_XKB_LAYOUT and $MY_XKB_MODEL, for the keyboard associated with the
# seat
- echo "xephyr-wrapper :${SEAT_NUMBER} -br"
+ echo "xephyr-wrapper :$XEPHYR_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 :${SEAT_NUMBER} -br \
- -parent ${SEAT_WINDOW_ID} \
- -mouse evdev,,device=$MOUSE \
- -keybd \
+ $XEPHYR_WRAPPER :$XEPHYR_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.${SEAT_NUMBER}.pid
+ echo $PID > $MDM_PIDS/Xephyr.${XEPHYR_NUMBER}.pid
wait $PID
- rm -f $MDM_PIDS/xephyr-xdmcp-Xephyr.${SEAT_NUMBER}.pid
+ rm -f $MDM_PIDS/xephyr-xdmcp-Xephyr.${XEPHYR_NUMBER}.pid
+
}
function display_manager_stop () {