Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2013-11-29 16:26:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2013-11-05 13:53:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2013-11-29 16:26:19.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 29 13:46:21 UTC 2013 - [email protected] + +- Add patch + tty3270-on-serial-line-of-s390.patch + to better support the first and second serial line on s390/x + +------------------------------------------------------------------- New: ---- tty3270-on-serial-line-of-s390.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.gMXXEI/_old 2013-11-29 16:26:20.000000000 +0100 +++ /var/tmp/diff_new_pack.gMXXEI/_new 2013-11-29 16:26:20.000000000 +0100 @@ -110,6 +110,8 @@ Patch12: util-linux-2.23.1-noenc-suse.diff # PATCH-FIX-UPSTREAM blkdiscard-BLKSSZGET-fills-in-an-int.patch [email protected] Patch13: blkdiscard-BLKSSZGET-fills-in-an-int.patch +# PATCH-FIX-SUSE -- better support of S390 in agetty +Patch14: tty3270-on-serial-line-of-s390.patch # hack for boot.localfs Patch20: util-linux-HACK-boot.localfs.diff @@ -232,6 +234,7 @@ %patch8 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p0 # %patch20 -p1 # ++++++ tty3270-on-serial-line-of-s390.patch ++++++ Support the special terminal on first serial line on a S/390(x) which is due legacy reasons a block terminal of type 3270 or higher. Whereas the second serial line on a S/390(x) is a real character terminal which is compatible with VT220. --- agetty.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) --- term-utils/agetty.c +++ term-utils/agetty.c 2013-11-29 11:57:11.000000000 +0000 @@ -49,6 +49,10 @@ # ifndef DEFAULT_VCTERM # define DEFAULT_VCTERM "linux" # endif +# if defined (__s390__) || defined (__s390x__) +# define DEFAULT_TTYS0 "ibm327x" +# define DEFAULT_TTYS1 "vt220" +# endif # ifndef DEFAULT_STERM # define DEFAULT_STERM "vt102" # endif @@ -983,6 +987,20 @@ static void open_tty(char *tty, struct t if (tcgetattr(STDIN_FILENO, tp) < 0) log_err(_("%s: failed to get terminal attributes: %m"), tty); +#if defined (__s390__) || defined (__s390x__) + if (!op->term) { + /* + * Special terminal on first serial line on a S/390(x) which + * is due legacy reasons a block terminal of type 3270 or + * higher. Whereas the second serial line on a S/390(x) is + * a real character terminal which is compatible with VT220. + */ + if (strcmp(op->tty, "ttyS0") == 0) + op->term = DEFAULT_TTYS0; + else if (strcmp(op->tty, "ttyS1") == 0) + op->term = DEFAULT_TTYS1; + } +#endif /* * Detect if this is a virtual console or serial/modem line. * In case of a virtual console the ioctl TIOCMGET fails and -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
