On Wed, 2016-11-16 at 12:07 -0800, Martin Michlmayr wrote: > Package: rootskel > Version: 1.119 > Severity: serious > Tags: patch > > Several users have reported to me that the network-console images are > broken. > > Commit ec6d3c3d79 (Move screen support) moved the screen support > around and also changed the logic of when screen is used. > Unfortunately, that change broke all network-console images which now > lead to: > > installer@192.168.0.102's password: > There is no screen to be resumed matching sh. > Connection to 192.168.0.102 closed. > > This is because d-i is already running in screen on the serial console but > it's active and can't be resumed. > > I believe below is the right fix, i.e. start screen when screen exists and > when we're on serial or when we're NOT on network. > > Samuel, Roger, does that look correct? > > diff --git a/src/lib/debian-installer.d/S70menu > b/src/lib/debian-installer.d/S70menu > index 7b35fac..14cad7f 100644 > --- a/src/lib/debian-installer.d/S70menu > +++ b/src/lib/debian-installer.d/S70menu > @@ -11,7 +11,7 @@ if [ -x "$bterm" ] && [ -e "$font" ] && [ -n "$TERM_UTF8" ] > && [ -n "$TERM_FRAME > set -e > else > rm -f $font > - if [ -x "$screen_bin" -a \( "$TERM_TYPE" = network -o "$TERM_TYPE" = > serial \) -a "$TERM" != dumb ]; then > + if [ -x "$screen_bin" -a \( "$TERM_TYPE" != network -o "$TERM_TYPE" = > serial \) -a "$TERM" != dumb ]; then
This makes the comparison with 'serial' redundant; the condition will
be equivalent to:
[ -x "$screen_bin" -a "$TERM_TYPE" != network -a "$TERM" != dumb ]
Is that really what we want?
Ben.
> # there's GNU/screen binary, run menu in it.
> > # call this script again with in GNU/screen, possibly in UTF-8
> > mode
> > SCREEN_OPT=""
>
--
Ben Hutchings
Time is nature's way of making sure that everything doesn't happen at
once.
signature.asc
Description: This is a digitally signed message part
