From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 16 Jul 2009 11:49:23 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1237c6b2fa2ea0d4918302e2cc818b2829df0c9e;p=util-linux

Merge commit 'origin/master'

Conflicts:
	AUTHORS
	NEWS
	config/include-Makefile.am
	configure.ac
	mount/lomount.c
	po/POTFILES.in
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pl.po
	po/pt_BR.po
	po/ru.po
	po/sl.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/util-linux-ng.pot
	po/vi.po
	po/zh_CN.po
---

1237c6b2fa2ea0d4918302e2cc818b2829df0c9e
diff --cc mount/lomount.c
index 2768ea37,b17ed5c8..fd12ce29
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@@ -975,8 -910,7 +989,8 @@@ usage(void) 
  int
  main(int argc, char **argv) {
  	char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
 +	char *keysize;
- 	int delete, find, c, all;
+ 	int delete, find, c, all, capacity;
  	int res = 0;
  	int showdev = 0;
  	int ro = 0;
@@@ -1017,7 -946,7 +1032,7 @@@
  	if ((p = strrchr(progname, '/')) != NULL)
  		progname = p+1;
  
- 	while ((c = getopt_long(argc, argv, "ade:E:fhj:k:No:p:rsv",
 -	while ((c = getopt_long(argc, argv, "acde:E:fhj:o:p:rsv",
++	while ((c = getopt_long(argc, argv, "acde:E:fhj:k:No:p:rsv",
  				longopts, NULL)) != -1) {
  		switch (c) {
  		case 'a':