[Pkg-ltsp-devel] Bug#591608: ltsp-server: XS80-x-modes mishandles modelines in X_MODE_{0, 1, 2}

[Andre Majorel]

Subject: ltsp-server: 
Package: ltsp-server
Version: 5.2.2-1
Severity: normal

*** Please type your report below this line ***

Dear ltsp-server maintainer,

as reported on ltsp-discuss one month ago,
/usr/share/ltsp/screen-session.d/XS80-x-modes assumes that
X_MODE_{0,1,2} are set to just a mode name (E.G. X_MODE_0 =
640x480).

When an X_MODE_[012] parameter is set to a mode name and
modeline, only the first word goes into Screen.Display.Modes.
The rest is for Monitor.Modeline.

A version of XS80-x-modes that fixes this is attached.

Thank you.

-- 
André Majorel <http://www.teaser.fr/~amajorel/>
Discriminating spammers prefer bugs.debian.org.
-------------- next part --------------
# if X_MODE_* are set and xrandr is disabled, generate a Display subsection
# with the defined modes

modes=
modelines=

if boolean_is_true "$XRANDR_DISABLE"; then
  for s in "$X_MODE_0" "$X_MODE_1" "$X_MODE_2"; do
    read -r mode modeline <<EOF
`printf '%s' "$s"`
EOF
    test -n "$mode" || continue
    CONFIGURE_X="True"
    modes="$modes \"$mode\""
    test -n "$modeline" || continue
    modelines=`cat <<EOF
"$mode" $modeline
$modelines
EOF`
  done

  if test -n "$modes"; then
    eval "set_x_modes() { printf '        Modes %s\\n' '$modes'; }"
    display_hacks="$display_hacks set_x_modes"
  fi
  if test -n "$modelines"; then
    xorg_conf_src=`printf '%s\n' "$modelines" | sed 's/.*/        Modeline &/'`
    eval "set_x_modelines() { printf '%s\n' '$xorg_conf_src'; }"
    monitor_hacks="$monitor_hacks set_x_modelines"
  fi
fi