|
|
@ -70,9 +70,6 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
# Default options.
|
|
|
|
# Default options.
|
|
|
|
|
|
|
|
|
|
|
|
[[ -z "${binlist[*]}" ]] && binlist=()
|
|
|
|
|
|
|
|
[[ -z "${namelist[*]}" ]] && namelist=()
|
|
|
|
|
|
|
|
[[ -z "${flaglist[*]}" ]] && flaglist=()
|
|
|
|
|
|
|
|
dialogrc=${dialogrc:-}
|
|
|
|
dialogrc=${dialogrc:-}
|
|
|
|
countfrom=${countfrom:-0}
|
|
|
|
countfrom=${countfrom:-0}
|
|
|
|
display=${display:-0}
|
|
|
|
display=${display:-0}
|
|
|
@ -80,7 +77,10 @@ xtty=${xtty:-7}
|
|
|
|
locktty=${locktty:-no}
|
|
|
|
locktty=${locktty:-no}
|
|
|
|
consolekit=${consolekit:-yes}
|
|
|
|
consolekit=${consolekit:-yes}
|
|
|
|
cktimeout=${cktimeout:-30}
|
|
|
|
cktimeout=${cktimeout:-30}
|
|
|
|
serverargs=${serverargs:-'-nolisten tcp'}
|
|
|
|
[[ -z "${binlist[*]}" ]] && binlist=()
|
|
|
|
|
|
|
|
[[ -z "${namelist[*]}" ]] && namelist=()
|
|
|
|
|
|
|
|
[[ -z "${flaglist[*]}" ]] && flaglist=()
|
|
|
|
|
|
|
|
[[ -z "${serverargs[*]}" ]] && serverargs=(-nolisten tcp)
|
|
|
|
|
|
|
|
|
|
|
|
# Offer all available sessions in /etc/X11/Sessions,
|
|
|
|
# Offer all available sessions in /etc/X11/Sessions,
|
|
|
|
# if $binlist if not explicitly set in cdmrc.
|
|
|
|
# if $binlist if not explicitly set in cdmrc.
|
|
|
@ -172,14 +172,14 @@ case ${flaglist[$binindex]} in
|
|
|
|
vt="$((xtty+display))"
|
|
|
|
vt="$((xtty+display))"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
serverargs=":${display} $serverargs vt$vt"
|
|
|
|
serverargs=(":${display}" "${serverargs[@]}" "vt$vt")
|
|
|
|
|
|
|
|
|
|
|
|
$(yesno consolekit) && launchflags="-c -t $cktimeout"
|
|
|
|
$(yesno consolekit) && launchflags=(-c -t "$cktimeout")
|
|
|
|
if ! eval cdm-xlaunch $launchflags -- $bin -- $serverargs; then
|
|
|
|
if cdm-xlaunch "${launchflags[@]}" -- "$bin" -- "${serverargs[@]}"; then
|
|
|
|
|
|
|
|
exitnormal
|
|
|
|
|
|
|
|
else
|
|
|
|
warn "\`cdm-xlaunch' exited unsuccessfully."
|
|
|
|
warn "\`cdm-xlaunch' exited unsuccessfully."
|
|
|
|
exiterror
|
|
|
|
exiterror
|
|
|
|
else
|
|
|
|
|
|
|
|
exitnormal
|
|
|
|
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|