From: LaMont Jones <lamont@debian.org>
Date: Tue, 1 Feb 2011 03:15:49 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	mount/mount.8
	mount/mount.c
---

11292d25510e67c83c6580401eccd42d6d6da931
diff --cc login-utils/agetty.c
index e66b8a53,57d19803..170ed4b3
--- a/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@@ -35,12 -35,9 +35,13 @@@
  #include "strutils.h"
  #include "nls.h"
  #include "pathnames.h"
+ #include "c.h"
  
 -#ifdef __linux__
 +#if defined(__FreeBSD_kernel__)
 +#include <pty.h>
 +#endif
 +
 +#if defined(__linux__) || defined(__FreeBSD_kernel__)
  #include <sys/param.h>
  #define USE_SYSLOG
  #endif
diff --cc mount/mount.c
index 0dea4297,9fd92480..36d1a57f
--- a/mount/mount.c
+++ b/mount/mount.c
@@@ -93,9 -87,15 +93,18 @@@ static int restricted = 1
  /* Contains the fd to read the passphrase from, if any. */
  static int pfd = -1;
  
 +/* Contains the preferred keysize in bits we want to use */
 +static int keysz = 0;
 +
+ #ifdef HAVE_LIBMOUNT_MOUNT
+ static struct libmnt_update *mtab_update;
+ static char *mtab_opts;
+ static unsigned long mtab_flags;
+ 
+ static void prepare_mtab_entry(const char *spec, const char *node,
+ 			const char *type, const char *opts, unsigned long flags);
+ #endif
+ 
  /* mount(2) options */
  struct mountargs {
         const char *spec;