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

Merge commit 'origin/stable/v2.14' into stable/v2.14

Conflicts:

	mount/Makefile.am
---

d5aaae24315bcaa04439216e5a074fe17efaede2
diff --cc mount/Makefile.am
index 3592eb2a,43b3d6d8..70422495
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -12,9 -16,10 +16,10 @@@ headers_common = fstab.h mount_mntent.
  	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 ../lib/linux_version.c \
- 	../lib/blkdev.c
+ 	../lib/blkdev.c $(fallback)
+ 
  
  mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c
  mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
@@@ -27,9 -32,10 +32,10 @@@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_L
  swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
  
  losetup_SOURCES = lomount.c sundries.c xmalloc.c realpath.c \
- 	loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c
 -	loop.h lomount.h xmalloc.h sundries.h realpath.h $(fallback)
++	loop.h lomount.h xmalloc.h sundries.h realpath.h rmd160.c $(fallback)
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
  
+ 
  mount_LDADD = $(LDADD_common)
  umount_LDADD = $(LDADD_common)
  swapon_LDADD = $(LDADD_common)
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);