Bump version

diff --git a/VERSION b/VERSION
index 0ba7ed95b24c871cbc63e44e220b56a673141b77..1dff2c48a7d4a335fa46f16f1ddffd3b05c5ce53 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=2
-PKG_REVISION=2
+PKG_REVISION=3
 PKG_BUILD=0

diff --git a/doc/CHANGES b/doc/CHANGES
index de86dd9278d9071d7bdeb8631ad2c614b07eda6e..5f47f7bd3f69c47402e65e7c6fe048ce670d9de9 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.2.3 (28 August 2002)
+       - Fix call to lvdisplay on LVM volumes so that lvdisplay
+         always gets the full, real path to the volume, as required.
+
 xfsprogs-2.2.2 (19 August 2002)
        - Fix endian bug in xfs_db, was not flipping 16-bit numbers.
        - Make xfs_repair recognize a NULLFSINO and print that in

diff --git a/libdisk/lvm.c b/libdisk/lvm.c
index e4b63bc02425a94934b6040c2b87b9bf8f00182d..8e1451fe93c8ad7ea9e612a8f44815117dfc05c5 100644 (file)
--- a/libdisk/lvm.c
+++ b/libdisk/lvm.c
@@ -37,6 +37,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <volume.h>
 
 #ifndef LVM_BLK_MAJOR
@@ -64,6 +65,7 @@ lvm_get_subvol_stripe(
        int             lvpipe[2], stripes = 0, stripesize = 0;
        char            *largv[3], buf[1024];
        FILE            *stream;
+       char            tmppath[MAXPATHLEN];
 
        if (!mnt_is_lvm_subvol(sb->st_rdev))
                return 0;
@@ -81,7 +83,16 @@ lvm_get_subvol_stripe(
                return 0;
        }
 
-       largv[1] = dfile;
+       /* lvm tools want the full, real path to a logical volume.
+        * (lvm doesn't really open the file, it just wants a
+        * string that happens to look like a path :/ )
+        */
+       if (dfile[0] != '/') {
+               getcwd(tmppath, MAXPATHLEN);
+               strcat(tmppath, "/");
+               dfile = strcat(tmppath, dfile);
+       }
+       largv[1] = realpath(dfile, tmppath);
        largv[2] = NULL;
 
        /* Open pipe */