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

util-linux-2.17.1-losetup-honor-documented-c-option

@@ -0,0 +1,26 @@
+From: Jeff Mahoney <jeffm@suse.com>
+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 <jeffm@suse.com>
+Acked-by: Jeff Mahoney <jeffm@suse.com>
+---
+ 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':

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
 

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