From 7b865daa578495889f7c3556fed6fac8434ef690f2cb591e73f5d3e4e80c84b2 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Thu, 6 May 2021 14:40:53 +0000 Subject: [PATCH] Accepting request 891061 from home:markkp:branches:Base:System - Modified s390-tools-sles15-Implement-Y-yast_mode.patch by adding a fflush(stdout) statement so that the dasdfmt command would produce the correct output for YaST. (bsc#1182816, bsc#1182820) - Modified s390-tools-sles15-Implement-f-for-backwards-compability.patch to have the correct offset for hunk #2 to apply without warnings. OBS-URL: https://build.opensuse.org/request/show/891061 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=120 --- s390-tools-sles15sp3-Implement-Y-yast_mode.patch | 8 +++++--- ...sles15sp3-Implement-f-for-backwards-compability.patch | 2 +- s390-tools.changes | 9 +++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/s390-tools-sles15sp3-Implement-Y-yast_mode.patch b/s390-tools-sles15sp3-Implement-Y-yast_mode.patch index da44b76..34afb87 100644 --- a/s390-tools-sles15sp3-Implement-Y-yast_mode.patch +++ b/s390-tools-sles15sp3-Implement-Y-yast_mode.patch @@ -104,16 +104,18 @@ index 6dd28fa..5b6023a 100644 printf("ok\n"); } } -@@ -1548,6 +1556,8 @@ +@@ -1548,6 +1556,10 @@ error("%s", str); set_geo(&cylinders, &heads); -+ if (g.yast_mode) ++ if (g.yast_mode) { + printf("%d\n", cylinders); ++ fflush(stdout); ++ } set_label(&vlabel, &format_params, cylinders); if (g.check) -@@ -1693,6 +1701,10 @@ int main(int argc, char *argv[]) +@@ -1693,6 +1703,10 @@ int main(int argc, char *argv[]) case OPT_NODISCARD: g.no_discard = 1; break; diff --git a/s390-tools-sles15sp3-Implement-f-for-backwards-compability.patch b/s390-tools-sles15sp3-Implement-f-for-backwards-compability.patch index 19f4367..fae53fe 100644 --- a/s390-tools-sles15sp3-Implement-f-for-backwards-compability.patch +++ b/s390-tools-sles15sp3-Implement-f-for-backwards-compability.patch @@ -52,7 +52,7 @@ index 5b6023a..cdd80df 100644 UTIL_OPT_SECTION("FORMAT OPTIONS"), { .option = { "blocksize", required_argument, NULL, 'b' }, -@@ -1623,6 +1627,12 @@ +@@ -1627,6 +1631,12 @@ } g.layout_specified = 1; break; diff --git a/s390-tools.changes b/s390-tools.changes index 80111f5..03d9177 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu May 6 13:59:15 UTC 2021 - Mark Post + +- Modified s390-tools-sles15-Implement-Y-yast_mode.patch by adding + a fflush(stdout) statement so that the dasdfmt command would + produce the correct output for YaST. (bsc#1182816, bsc#1182820) +- Modified s390-tools-sles15-Implement-f-for-backwards-compability.patch + to have the correct offset for hunk #2 to apply without warnings. + ------------------------------------------------------------------- Wed Apr 14 18:13:27 UTC 2021 - Mark Post