SHA256
1
0
forked from pool/s390-tools

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
This commit is contained in:
Mark Post 2021-05-06 14:40:53 +00:00 committed by Git OBS Bridge
parent 8a9ea5c870
commit 7b865daa57
3 changed files with 15 additions and 4 deletions

View File

@ -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;

View File

@ -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;

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 6 13:59:15 UTC 2021 - Mark Post <mpost@suse.com>
- 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 <mpost@suse.com>