From: Nathan Scott <nathans@sgi.com>
Date: Wed, 5 Apr 2006 03:56:25 +0000 (+0000)
Subject: Fix up xfsprogs Debian build issue, and access to /etc/mtab checks.
X-Git-Tag: v2.8.0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc7180cec0c99d0a8cf49f8fb531c46d43f47c95;p=thirdparty%2Fxfsprogs-dev.git

Fix up xfsprogs Debian build issue, and access to /etc/mtab checks.
Merge of master-melb:xfs-cmds:25678a by kenmcd.
---

diff --git a/debian/changelog b/debian/changelog
index 757775919..3d6a16b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xfsprogs (2.7.16-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Nathan Scott <nathans@debian.org>  Mon, 27 Mar 2006 15:27:27 +1100
+ -- Nathan Scott <nathans@debian.org>  Wed, 05 Apr 2006 11:45:58 +1000
 
 xfsprogs (2.7.14-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a764d8dfb..89b661e1c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Description: Utilities for managing the XFS filesystem
 Package: xfslibs-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev, uuid-dev, xfsprogs (>= 2.0.0)
+Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 2.0.0)
 Conflicts: xfsprogs (<< 2.0.0)
 Architecture: any
 Description: XFS filesystem-specific static libraries and headers
diff --git a/doc/CHANGES b/doc/CHANGES
index 8be8d67a9..83317b105 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,10 @@
+xfsprogs-2.7.17 (05 April 2006)
+	- Fix libxfs access(2) check on /proc/mounts, which was
+	  causing issues when xfs_check/xfs_repair run on readonly
+	  root filesystem mounts.
+	- Fix Debian packaging for libc-dev build dependency.
+	- Fix up auto lib64 install detection for x86_64 platforms.
+
 xfsprogs-2.7.16 (22 March 2006)
 	- Fix freespace accounting in xfs_quota(8) df command.
 	- Fix a typo on the xfs_quota(8) man page.
diff --git a/libxfs/linux.c b/libxfs/linux.c
index 95b7c8801..6aaea3826 100644
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -76,7 +76,7 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
 	struct mntent	*mnt;
 	char		mounts[MAXPATHLEN];
 
-	strcpy(mounts, access(PROC_MOUNTED, R_OK)? PROC_MOUNTED : MOUNTED);
+	strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
 	if ((f = setmntent(mounts, "r")) == NULL) {
 		fprintf(stderr, _("%s: %s contains a possibly writable, "
 				"mounted filesystem\n"), progname, name);