From: LaMont Jones <lamont@debian.org>
Date: Tue, 17 Feb 2009 12:48:10 +0000 (-0700)
Subject: Merge branch 'stable/v2.14'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e218b8a8c0f7a9f9eb3591a91d2e2120da4171c8;p=util-linux

Merge branch 'stable/v2.14'

Conflicts:

	fdisk/fdisk.c
	fdisk/partname.c
	include/blkdev.h
	mount/fstab.c
	mount/lomount.c
	mount/mount.8
	mount/umount.c
	schedutils/chrt.c
	schedutils/ionice.1
	sys-utils/Makefile.am
	sys-utils/ipcs.c
	sys-utils/rtcwake.c
---

e218b8a8c0f7a9f9eb3591a91d2e2120da4171c8
diff --cc mount/Makefile.am
index 70bd1ba3,e83dbb71..acaf848c
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -24,13 -29,13 +29,14 @@@ umount_SOURCES = umount.c $(mount_commo
  umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
  umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
  
 -swapon_SOURCES = swapon.c swap_constants.h $(utils_common)
 +swapon_SOURCES = swapon.c swap_constants.h $(utils_common) \
 +	../lib/linux_version.c ../lib/blkdev.c
  
  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 rmd160.c $(fallback)
  losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)
  
+ 
  mount_LDADD = $(LDADD_common)
  umount_LDADD = $(LDADD_common)
  swapon_LDADD = $(LDADD_common)
diff --cc mount/lomount.c
index 7371c4ea,f80ec72d..b7f32b7e
--- a/mount/lomount.c
+++ b/mount/lomount.c
@@@ -24,8 -25,11 +24,12 @@@
  #include "sundries.h"
  #include "xmalloc.h"
  #include "realpath.h"
 +#include "pathnames.h"
  
+ #ifndef HAVE_VERSIONSORT
+ # include "strverscmp.h"
+ #endif
+ 
  #define SIZE(a) (sizeof(a)/sizeof(a[0]))
  
  #ifdef LOOP_SET_FD
diff --cc mount/mount.8
index c11df15d,93eefc4a..0c5166ff
--- a/mount/mount.8
+++ b/mount/mount.8
@@@ -191,6 -176,6 +191,22 @@@ mounts under a given mountpoint
  .fi
  .RE
  .RE
++.RE
++
++.B The device indication.
++.RS
++Most devices are indicated by a file name (of a block special device), like
++.IR /dev/sda1 ,
++but there are other possibilities. For example, in the case of an NFS mount,
++.I device
++may look like
++.IR knuth.cwi.nl:/dir .
++It is possible to indicate a block special device using its
++volume
++.B LABEL
++or
++.B UUID
++(see the \-L and \-U options below).
  
  .B The device indication.
  .RS