From 7358dde8506cc2f3c1f59e2e86f720eee05b38b6b2be3b196817eedf1fa02f68 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 6 Apr 2017 15:55:13 +0000 Subject: [PATCH] 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 --- python-libmount.changes | 6 ++++++ ...-losetup-Add-support-for-setting-logical-blocksize.patch | 6 +++--- util-linux-systemd.changes | 6 ++++++ util-linux.changes | 6 ++++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 6986fe5..124ce88 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -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 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 diff --git a/util-linux-losetup-Add-support-for-setting-logical-blocksize.patch b/util-linux-losetup-Add-support-for-setting-logical-blocksize.patch index 723355d..664fb43 100644 --- a/util-linux-losetup-Add-support-for-setting-logical-blocksize.patch +++ b/util-linux-losetup-Add-support-for-setting-logical-blocksize.patch @@ -67,7 +67,7 @@ Index: util-linux-2.29/sys-utils/losetup.c fputs(_(" -o, --offset start at offset into file\n"), out); fputs(_(" --sizelimit device is limited to bytes of the file\n"), out); -+ fputs(_(" -L, --logical-blocksize set the logical block size to \n"), out); ++ fputs(_(" --logical-blocksize set the logical block size to \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(_(" --direct-io[=] open backing file with O_DIRECT\n"), out); @@ -105,7 +105,7 @@ Index: util-linux-2.29/sys-utils/losetup.c OPT_RAW, - OPT_DIO + OPT_DIO, -+ OPT_BLOCKSIZE ++ OPT_BLOCKSIZE, }; static const struct option longopts[] = { { "all", 0, 0, 'a' }, @@ -113,7 +113,7 @@ Index: util-linux-2.29/sys-utils/losetup.c { "associated", 1, 0, 'j' }, { "json", 0, 0, 'J' }, { "list", 0, 0, 'l' }, -+ { "logical-blocksize", 1, 0, 'L' }, ++ { "logical-blocksize", 1, 0, OPT_BLOCKSIZE }, { "noheadings", 0, 0, 'n' }, { "offset", 1, 0, 'o' }, { "output", 1, 0, 'O' }, diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 6986fe5..124ce88 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -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 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 diff --git a/util-linux.changes b/util-linux.changes index 6986fe5..124ce88 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -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 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