From 271c52a2baa4787e2cf18e460bb446ba73bc08bdf212fa20d051cc46e2930300 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 1 Mar 2023 16:51:04 +0000 Subject: [PATCH] Accepting request 1067908 from home:pgajdos - added patches agetty: don't ignore --noclear when re-print issue file https://github.com/util-linux/util-linux/commit/0c0fb46dcef6c63c74094486e499e376fdb33a04.diff [bsc#1194322] + util-linux-honor-noclear-when-reprint-issue.patch OBS-URL: https://build.opensuse.org/request/show/1067908 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=496 --- ...nux-honor-noclear-when-reprint-issue.patch | 24 +++++++++++++++++++ util-linux.changes | 9 +++++++ util-linux.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 util-linux-honor-noclear-when-reprint-issue.patch diff --git a/util-linux-honor-noclear-when-reprint-issue.patch b/util-linux-honor-noclear-when-reprint-issue.patch new file mode 100644 index 0000000..eb08d4f --- /dev/null +++ b/util-linux-honor-noclear-when-reprint-issue.patch @@ -0,0 +1,24 @@ +Index: util-linux-2.38.1/term-utils/agetty.c +=================================================================== +--- util-linux-2.38.1.orig/term-utils/agetty.c ++++ util-linux-2.38.1/term-utils/agetty.c +@@ -2066,7 +2066,8 @@ again: + if (!wait_for_term_input(STDIN_FILENO)) { + eval_issue_file(ie, op, tp); + if (issue_is_changed(ie)) { +- if (op->flags & F_VCONSOLE) ++ if ((op->flags & F_VCONSOLE) ++ && (op->flags & F_NOCLEAR) == 0) + termio_clear(STDOUT_FILENO); + goto again; + } +@@ -2207,7 +2208,8 @@ static char *get_logname(struct issue *i + if (!issue_is_changed(ie)) + goto no_reload; + tcflush(STDIN_FILENO, TCIFLUSH); +- if (op->flags & F_VCONSOLE) ++ if ((op->flags & F_VCONSOLE) ++ && (op->flags & F_NOCLEAR) == 0) + termio_clear(STDOUT_FILENO); + bp = logname; + *bp = '\0'; diff --git a/util-linux.changes b/util-linux.changes index b5d4a87..62e6c86 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Feb 27 09:01:54 UTC 2023 - pgajdos@suse.com + +- added patches + agetty: don't ignore --noclear when re-print issue file + https://github.com/util-linux/util-linux/commit/0c0fb46dcef6c63c74094486e499e376fdb33a04.diff + [bsc#1194322] + + util-linux-honor-noclear-when-reprint-issue.patch + ------------------------------------------------------------------- Tue Feb 14 16:07:27 UTC 2023 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index 3457e85..ecbfcdb 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -112,6 +112,8 @@ Patch2: Add-documentation-on-blacklisted-modules-to-mount-8-.patch Patch4: util-linux-bash-completion-su-chsh-l.patch # PATCH-FIX-SUSE util-linux-fix-tests-when-@-in-path.patch bsc#1194038 -- rpmbuild %checks fail when @ in the directory path Patch5: util-linux-fix-tests-when-at-symbol-in-path.patch +# https://github.com/util-linux/util-linux/commit/0c0fb46dcef6c63c74094486e499e376fdb33a04.diff +Patch6: util-linux-honor-noclear-when-reprint-issue.patch BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel