3
0
forked from pool/util-linux

Accepting request 486195 from home:sbrabec:branches:util-linux-leap_42_3-merge-try2

- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
  --logical-blocksize was behaving like --nooverlap

OBS-URL: https://build.opensuse.org/request/show/486195
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=338
This commit is contained in:
Stanislav Brabec 2017-04-06 15:55:13 +00:00 committed by Git OBS Bridge
parent 4c87942509
commit 7358dde850
4 changed files with 21 additions and 3 deletions

View File

@ -4,6 +4,12 @@ Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax - To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10. release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com

View File

@ -67,7 +67,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
fputs(_(" -o, --offset <num> start at offset <num> into file\n"), out); fputs(_(" -o, --offset <num> start at offset <num> into file\n"), out);
fputs(_(" --sizelimit <num> device is limited to <num> bytes of the file\n"), out); fputs(_(" --sizelimit <num> device is limited to <num> bytes of the file\n"), out);
+ fputs(_(" -L, --logical-blocksize <size> set the logical block size to <size>\n"), out); + fputs(_(" --logical-blocksize <size> set the logical block size to <size>\n"), out);
fputs(_(" -P, --partscan create a partitioned loop device\n"), out); fputs(_(" -P, --partscan create a partitioned loop device\n"), out);
fputs(_(" -r, --read-only set up a read-only loop device\n"), out); fputs(_(" -r, --read-only set up a read-only loop device\n"), out);
fputs(_(" --direct-io[=<on|off>] open backing file with O_DIRECT\n"), out); fputs(_(" --direct-io[=<on|off>] open backing file with O_DIRECT\n"), out);
@ -105,7 +105,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
OPT_RAW, OPT_RAW,
- OPT_DIO - OPT_DIO
+ OPT_DIO, + OPT_DIO,
+ OPT_BLOCKSIZE + OPT_BLOCKSIZE,
}; };
static const struct option longopts[] = { static const struct option longopts[] = {
{ "all", 0, 0, 'a' }, { "all", 0, 0, 'a' },
@ -113,7 +113,7 @@ Index: util-linux-2.29/sys-utils/losetup.c
{ "associated", 1, 0, 'j' }, { "associated", 1, 0, 'j' },
{ "json", 0, 0, 'J' }, { "json", 0, 0, 'J' },
{ "list", 0, 0, 'l' }, { "list", 0, 0, 'l' },
+ { "logical-blocksize", 1, 0, 'L' }, + { "logical-blocksize", 1, 0, OPT_BLOCKSIZE },
{ "noheadings", 0, 0, 'n' }, { "noheadings", 0, 0, 'n' },
{ "offset", 1, 0, 'o' }, { "offset", 1, 0, 'o' },
{ "output", 1, 0, 'O' }, { "output", 1, 0, 'O' },

View File

@ -4,6 +4,12 @@ Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax - To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10. release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com

View File

@ -4,6 +4,12 @@ Thu Apr 6 17:35:34 CEST 2017 - sbrabec@suse.com
- To cover release numbers of both SLE12 SP3 and Leap 42.3, relax - To cover release numbers of both SLE12 SP3 and Leap 42.3, relax
release based conflict with bash-completion from 13.1 to 10. release based conflict with bash-completion from 13.1 to 10.
-------------------------------------------------------------------
Tue Apr 4 14:51:09 UTC 2017 - sweet_f_a@gmx.de
- fix util-linux-losetup-Add-support-for-setting-logical-blocksize.patch
--logical-blocksize was behaving like --nooverlap
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com