forked from pool/util-linux
97ec137233
squashed sr234195 and re-submitted - Prevent excessive clock drift calculations (bnc#871698, util-linux-prevent-excessive-clock-drift-calculations.patch), committed by sbrabec@suse.cz (forwarded request 234334 from rudi_m) OBS-URL: https://build.opensuse.org/request/show/234890 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=186
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
---
|
|
login-utils/sulogin.c | 8 +++++++-
|
|
term-utils/agetty.c | 15 ++++++++++-----
|
|
2 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
--- term-utils/agetty.c
|
|
+++ term-utils/agetty.c 2014-05-08 08:08:26.384484940 +0000
|
|
@@ -51,7 +51,8 @@
|
|
# define DEFAULT_VCTERM "linux"
|
|
# endif
|
|
# if defined (__s390__) || defined (__s390x__)
|
|
-# define DEFAULT_TTYS0 "ibm327x"
|
|
+# define DEFAULT_TTYS0 "dumb"
|
|
+# define DEFAULT_TTY32 "ibm327x"
|
|
# define DEFAULT_TTYS1 "vt220"
|
|
# endif
|
|
# ifndef DEFAULT_STERM
|
|
@@ -571,6 +572,8 @@ static void login_options_to_argv(char *
|
|
*argc = i;
|
|
}
|
|
|
|
+#define is_speed(str) (strlen((str)) == strspn((str), "0123456789,"))
|
|
+
|
|
/* Parse command-line arguments. */
|
|
static void parse_args(int argc, char **argv, struct options *op)
|
|
{
|
|
@@ -749,7 +752,7 @@ static void parse_args(int argc, char **
|
|
}
|
|
|
|
/* Accept "tty", "baudrate tty", and "tty baudrate". */
|
|
- if ('0' <= argv[optind][0] && argv[optind][0] <= '9') {
|
|
+ if (is_speed(argv[optind])) {
|
|
/* Assume BSD style speed. */
|
|
parse_speeds(op, argv[optind++]);
|
|
if (argc < optind + 1) {
|
|
@@ -761,7 +764,7 @@ static void parse_args(int argc, char **
|
|
op->tty = argv[optind++];
|
|
if (argc > optind) {
|
|
char *v = argv[optind++];
|
|
- if ('0' <= *v && *v <= '9')
|
|
+ if (is_speed(v))
|
|
parse_speeds(op, v);
|
|
else
|
|
op->speeds[op->numspeed++] = bcode("9600");
|
|
@@ -1071,9 +1074,11 @@ static void open_tty(char *tty, struct t
|
|
* 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)
|
|
+ if (strcmp(op->tty, "ttyS0") == 0) /* linux/drivers/s390/char/con3215.c */
|
|
op->term = DEFAULT_TTYS0;
|
|
- else if (strcmp(op->tty, "ttyS1") == 0)
|
|
+ else if (strncmp(op->tty, "3270/tty", 8) == 0) /* linux/drivers/s390/char/con3270.c */
|
|
+ op->term = DEFAULT_TTY32;
|
|
+ else if (strcmp(op->tty, "ttyS1") == 0) /* linux/drivers/s390/char/sclp_vt220.c */
|
|
op->term = DEFAULT_TTYS1;
|
|
}
|
|
#endif
|
|
--- login-utils/sulogin.c
|
|
+++ login-utils/sulogin.c 2014-05-08 08:22:38.572781002 +0000
|
|
@@ -189,10 +189,16 @@ static void tcfinal(struct console *con)
|
|
setenv("TERM", "linux", 1);
|
|
return;
|
|
}
|
|
- if (con->flags & CON_NOTTY)
|
|
+ if (con->flags & CON_NOTTY) {
|
|
+ setenv("TERM", "dumb", 1);
|
|
return;
|
|
+ }
|
|
|
|
+#if defined (__s390__) || defined (__s390x__)
|
|
+ setenv("TERM", "dumb", 1);
|
|
+#else
|
|
setenv("TERM", "vt102", 1);
|
|
+#endif
|
|
tio = &con->tio;
|
|
fd = con->fd;
|
|
|