From: LaMont Jones <lamont@debian.org>
Date: Thu, 8 Nov 2007 03:07:28 +0000 (-0700)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f937562329c8cb09b5b6270474d2f02ef95792b;p=util-linux

Merge commit 'origin/master'

Conflicts:

	mount/Makefile.am
	mount/my_dev_t.h
---

1f937562329c8cb09b5b6270474d2f02ef95792b
diff --cc mount/Makefile.am
index f4430009,4ba8f56f..c4c39024
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -12,8 -12,9 +12,9 @@@ headers_common = fstab.h mount_mntent.
  	mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \
  	getusername.h loop.h sundries.h
  
 -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \
 +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c \
- 	$(utils_common) $(headers_common) ../lib/env.c
+ 	$(utils_common) $(headers_common) ../lib/env.c ../lib/linux_version.c \
+ 	../lib/blkdev.c
  
  mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
  mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
diff --cc mount/mount.c
index 43824c35,7a6ae004..86b751be
--- a/mount/mount.c
+++ b/mount/mount.c
@@@ -1685,13 -1658,8 +1673,9 @@@ 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 },
- 	{ "replace", 0, 0, 129 },
- 	{ "after", 0, 0, 130 },
- 	{ "before", 0, 0, 131 },
- 	{ "over", 0, 0, 132 },
  	{ "move", 0, 0, 133 },
  	{ "guess-fstype", 1, 0, 134 },
  	{ "rbind", 0, 0, 135 },