From: LaMont Jones <lamont@debian.org>
Date: Mon, 7 Jan 2008 03:49:07 +0000 (-0700)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f1591867eaf4690e8ce1307ba04846692a76a4;p=util-linux

Merge commit 'origin/master'

Conflicts:

	mount/mount.8
---

80f1591867eaf4690e8ce1307ba04846692a76a4
diff --cc mount/mount.8
index 02d2b7fe,ce52dd84..ac0eeef7
--- a/mount/mount.8
+++ b/mount/mount.8
@@@ -615,14 -615,8 +615,16 @@@ This option implies the option
  (unless overridden by subsequent options, as in the option line
  .BR group,dev,suid ).
  .TP
 +.B encryption
 +Specifies an encryption algorithm to use.  Used in conjunction with the
 +.BR loop " option."
 +.TP
 +.B keybits
 +Specifies the key size to use for an encryption algorithm. Used in conjunction
 +with the 
 +.BR loop " and " encryption " options."
+ .B nofail
+ Do not report errors for this device if it does not exist.
  .TP
  .B mand
  Allow mandatory locks on this filesystem. See
diff --cc mount/mount.c
index e9615104,0688c57f..66351159
--- a/mount/mount.c
+++ b/mount/mount.c
@@@ -188,9 -180,10 +189,11 @@@ static const struct opt_map opt_map[] 
    { NULL,	0, 0, 0		}
  };
  
+ static int opt_nofail = 0;
+ 
  static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_encryption,
  	*opt_speed, *opt_comment, *opt_uhelper;
 +static const char *opt_keybits, *opt_nohashpass;
  
  static int mounted (const char *spec0, const char *node0);
  static int check_special_mountprog(const char *spec, const char *node,