Merge commit 'origin/master'

Conflicts:

	mount/Makefile.am
	mount/mount.c

diff --cc fdisk/sfdisk.c
Simple merge

diff --cc login-utils/agetty.c
Simple merge

diff --cc mount/Makefile.am
index 41ae3fb0326684f2cd4216c292ea31d7efd0c699,46bcb5abe3fb655f0faed043b8a11a8216ab56df..f4430009aea7bd273a94b9ce6fdaea5ee232f060
--- 1/mount/Makefile.am
--- 2/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -25,7 -25,8 +25,8 @@@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_L
  
  swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
  
- losetup_SOURCES = lomount.c loop.h lomount.h rmd160.c
+ losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
 -      loop.h lomount.h xmalloc.h sundries.h realpath.h
++      loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
  
  mount_LDADD = $(LDADD_common)

diff --cc mount/lomount.c
index 69107910b1326ac88c77497abd08d99f93be3704,5bd8954076e72867b32524ea1a235f3c80f81914..74c6f6806ce153573d4fd0908a81cc43d47b1450
--- 1/mount/lomount.c
--- 2/mount/lomount.c
+++ b/mount/lomount.c
@@@ -20,14 -20,11 +20,12 @@@
  
  #include "loop.h"
  #include "lomount.h"
 +#include "rmd160.h"
  #include "xstrncpy.h"
  #include "nls.h"
- 
- extern int verbose;
- extern char *progname;
- extern char *xstrdup (const char *s); /* not: #include "sundries.h" */
- extern void error (const char *fmt, ...);     /* idem */
+ #include "sundries.h"
+ #include "xmalloc.h"
+ #include "realpath.h"
  
  #define SIZE(a) (sizeof(a)/sizeof(a[0]))
  

diff --cc mount/lomount.h
index a042d98f35ba008f05d17b5c6e37cabd96b1ad56,38b3a483ade5e2e6ac173090eb19ebfeaddeaf07..724bed1ef49813ee06ac655406b7c79409a4297a
--- 1/mount/lomount.h
--- 2/mount/lomount.h
+++ b/mount/lomount.h
@@@ -1,6 -1,5 +1,5 @@@
- extern int verbose;
  extern int set_loop(const char *, const char *, 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 char * find_unused_loop_device(void);

diff --cc mount/mount.c
index 2d23a72f963b80ecd9eaea9b3407a19980f3d75a,9d43e5ffa968aab748acceae1ffd978bd0b8a29b..43824c3534396b97b9412c6d5d79a8a2a2d854da
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -64,14 -62,8 +62,14 @@@ static int nomtab = 0
  /* True for explicit readonly (-r).  */
  static int readonly = 0;
  
 +/* Nonzero for chatty (-v).  */
 +int verbose = 0;
 +
 +/* Do we hash the password or not */
 +int hash_pass = 1;
 +
  /* Nonzero for sloppy (-s).  */
- int sloppy = 0;
+ static int sloppy = 0;
  
  /* True for explicit read/write (-w).  */
  static int readwrite = 0;
@@@ -1994,8 -2017,7 +2037,9 @@@ main(int argc, char *argv[]) 
                create_mtab ();
        }
  
 +      if (keysize && sscanf(keysize,"%d",&keysz) != 1)
 +              die (EX_USAGE, _("mount: argument to --keybits or -k must be a number"));
+       atexit(unlock_mtab);
  
        switch (argc+specseen) {
        case 0: