From: LaMont Jones <lamont@debian.org>
Date: Tue, 12 Aug 2008 05:57:02 +0000 (-0600)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0835fe033e7b90b610e22527fcff9d8635450e1;p=util-linux

Merge commit 'origin/master'

Conflicts:

	mount/mount.c
---

a0835fe033e7b90b610e22527fcff9d8635450e1
diff --cc mount/lomount.h
index 7d548b5a,59108d40..d24d8b62
--- a/mount/lomount.h
+++ b/mount/lomount.h
@@@ -1,7 -1,8 +1,8 @@@
  extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -		    const char *, int, int *);
 +		    const char *, int, int *, int, int);
  extern int del_loop(const char *);
  extern int is_loop_device(const char *);
+ extern int is_loop_autoclear(const char *device);
  extern char * find_unused_loop_device(void);
  
  extern int loopfile_used_with(char *devname, const char *filename, unsigned long long offset);
diff --cc mount/mount.c
index 62b89068,be051355..9bacda17
--- a/mount/mount.c
+++ b/mount/mount.c
@@@ -1665,12 -1683,11 +1698,12 @@@ static struct option longopts[] = 
  	{ "options", 1, 0, 'o' },
  	{ "test-opts", 1, 0, 'O' },
  	{ "pass-fd", 1, 0, 'p' },
 +	{ "keybits", 1, 0, 'k' },
  	{ "types", 1, 0, 't' },
- 	{ "bind", 0, 0, 128 },
- 	{ "move", 0, 0, 133 },
+ 	{ "bind", 0, 0, 'B' },
+ 	{ "move", 0, 0, 'M' },
  	{ "guess-fstype", 1, 0, 134 },
- 	{ "rbind", 0, 0, 135 },
+ 	{ "rbind", 0, 0, 'R' },
  	{ "make-shared", 0, 0, 136 },
  	{ "make-slave", 0, 0, 137 },
  	{ "make-private", 0, 0, 138 },
@@@ -1858,7 -1874,7 +1891,7 @@@ main(int argc, char *argv[]) 
  	initproctitle(argc, argv);
  #endif
  
- 	while ((c = getopt_long (argc, argv, "afFhik:lL:no:O:p:rsU:vVwt:",
 -	while ((c = getopt_long (argc, argv, "aBfFhilL:Mno:O:p:rRsU:vVwt:",
++	while ((c = getopt_long (argc, argv, "aBfFhik:lL:Mno:O:p:rRsU:vVwt:",
  				 longopts, NULL)) != -1) {
  		switch (c) {
  		case 'a':	       /* mount everything in fstab */