From: Nathan Scott <nathans@sgi.com>
Date: Mon, 18 Aug 2003 23:48:27 +0000 (+0000)
Subject: Bump xfsprogs version for Glens mkfs fix, fix a typo in one of the warning messages
X-Git-Tag: v2.6.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b50e4c6ef5b0a8eba11c2601136d5f86a59817d4;p=thirdparty%2Fxfsprogs-dev.git

Bump xfsprogs version for Glens mkfs fix, fix a typo in one of the warning messages
---

diff --git a/VERSION b/VERSION
index 754845fac..98097857a 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=5
-PKG_REVISION=5
+PKG_REVISION=6
 PKG_BUILD=0
diff --git a/debian/changelog b/debian/changelog
index 133fd1266..aaffdead5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
+xfsprogs (2.5.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nathan Scott <nathans@debian.org>  Tue, 19 Aug 2003 09:44:48 +1000
+
 xfsprogs (2.5.5-1) unstable; urgency=low
 
-  * New upstream release, this is the official XFS 1.3 xfsprogs.
+  * New upstream release.
 
  -- Nathan Scott <nathans@debian.org>  Thu, 07 Aug 2003 12:58:36 +1000
 
diff --git a/doc/CHANGES b/doc/CHANGES
index d9618c66d..d75011b90 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,5 +1,9 @@
+xfsprogs-2.5.6 (19 August 2003)
+	- Fix a mkfs problem where it could exit inappropriately when
+	  a large data volume stripe unit was either specified on the
+	  command line or via querying the underlying volume manager.
+
 xfsprogs-2.5.5 (07 August 2003)
-	- XFS 1.3 release version of xfsprogs.
 	- Update xfs_io command to allow reading from non-XFS files.
 	- Sync up user/kernel source in libxfs, libxlog and headers.
 	- Update xfs_db and xfs_logprint commands to print new inode
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 574287370..7762db3e3 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1770,11 +1770,10 @@ an AG size that is one stripe unit smaller, for example %llu.\n"),
 
 	if (logversion == 2 && (lsunit * blocksize) > 256 * 1024) {
 		fprintf(stderr,
-_("log stripe unit (%d bytes) is too large for kernel to handle (max 256k)\n"),
+	_("log stripe unit (%d bytes) is too large (maximum is 256KiB)\n"),
 			(lsunit * blocksize));
 		lsunit = 32 * 1024;
-		fprintf(stderr,
-			_("log stripe unit adjusted to 256kb\n"));
+		fprintf(stderr, _("log stripe unit adjusted to 32KiB\n"));
 	}
 
 	protostring = setup_proto(protofile);