From: LaMont Jones <lamont@debian.org>
Date: Tue, 3 Aug 2010 05:02:28 +0000 (-0600)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0864d694ca05ea9383ef09bc1bc3a182e15e2ffa;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	mount/Makefile.am
	sys-utils/ipcs.c
	tests/ts/blkid/images-fs/befs.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2
---

0864d694ca05ea9383ef09bc1bc3a182e15e2ffa
diff --cc mount/Makefile.am
index 1fbdfe82,83e1fcdd..5ff4fc9e
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@@ -7,7 -7,7 +7,7 @@@ sbin_PROGRAMS = losetup swapo
  dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
  
  # generic sources for all programs (mount, umount, losetup)
- srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h rmd160.c
 -srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
++srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c
  
  # generic header for mount and umount
  hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
diff --cc sys-utils/ipcs.c
index 99ad09d7,2ef5788d..0a950f66
--- a/sys-utils/ipcs.c
+++ b/sys-utils/ipcs.c
@@@ -494,11 -522,9 +522,11 @@@ void do_msg (char format
  		return;
  
  	case STATUS:
- 		printf (_("------ Messages: Status --------\n"));
+ 		printf (_("------ Messages Status --------\n"));
 +#ifndef __FreeBSD_kernel__
  		printf (_("allocated queues = %d\n"), msginfo.msgpool);
  		printf (_("used headers = %d\n"), msginfo.msgmap);
 +#endif
  		printf (_("used space = %d bytes\n"), msginfo.msgtql);
  		return;