From 4a27d3f4b16c4616347d87258769fd14bdfffeb0369d48bcb1a55d3e6247d28a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 12 Mar 2010 07:00:06 +0000 Subject: [PATCH] Accepting request 34572 from home:jeff_mahoney:branches:Base:System Copy from home:jeff_mahoney:branches:Base:System/util-linux via accept of submit request 34572 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34572 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=33 --- ...x-2.17.1-losetup-honor-documented-c-option | 26 +++++++++++++++++++ util-linux.changes | 5 ++++ util-linux.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 util-linux-2.17.1-losetup-honor-documented-c-option diff --git a/util-linux-2.17.1-losetup-honor-documented-c-option b/util-linux-2.17.1-losetup-honor-documented-c-option new file mode 100644 index 0000000..6a3bb68 --- /dev/null +++ b/util-linux-2.17.1-losetup-honor-documented-c-option @@ -0,0 +1,26 @@ +From: Jeff Mahoney +Subject: losetup: Honor documented -c option +References: bnc#583677 + + losetup -h lists -c | --set-capacity as valid options, but doesn't + actually accept -c. + + This patch fixes support for -c. + +Signed-off-by: Jeff Mahoney +Acked-by: Jeff Mahoney +--- + mount/lomount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/mount/lomount.c ++++ b/mount/lomount.c +@@ -1065,7 +1065,7 @@ main(int argc, char **argv) { + if ((p = strrchr(progname, '/')) != NULL) + progname = p+1; + +- while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:", ++ while ((c = getopt_long(argc, argv, "ade:E:fhj:k:o:p:rsvH:c", + longopts, NULL)) != -1) { + switch (c) { + case 'a': diff --git a/util-linux.changes b/util-linux.changes index a6ed5ca..accba55 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 10 23:11:42 CET 2010 - jeffm@suse.de + +- Properly honor documented -c option (bnc#583677) + ------------------------------------------------------------------- Tue Mar 2 09:53:04 UTC 2010 - lnussel@suse.de diff --git a/util-linux.spec b/util-linux.spec index 2515503..a8698a1 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -70,6 +70,7 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch Patch2: util-linux-2.14.1-mount_skip_sync.patch # crypto patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch +Patch4: util-linux-2.17.1-losetup-honor-documented-c-option ## ## adjtimex ## @@ -157,6 +158,7 @@ unique IDs (UUIDs). %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # cd adjtimex-* %patch50 -p1