Add fixed offset to imported pool minor numbers.v2_01_04old-v2_01_04

4 files changed, 7 insertions, 3 deletions

diff --git a/VERSION b/VERSION
index e13e91c85..6739210e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.01.04-cvs (2005-02-01)
+2.01.04-cvs (2005-02-09)
diff --git a/WHATS_NEW b/WHATS_NEW
index 926dd8b53..80c85cc9f 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
-Version 2.01.04 - 
+Version 2.01.04 - 9th February 2005
 ===================================
+  Add fixed offset to imported pool minor numbers.
+  Update binary pathnames in clvmd_init_rhel4.
   lvm2cmd.so should skip the check for open fds.
   Remove unused -f from pvmove.
   Gulm clvmd doesn't report "connection refused" errors.
diff --git a/lib/format_pool/disk_rep.h b/lib/format_pool/disk_rep.h
index bf8983b61..748e88429 100644
--- a/lib/format_pool/disk_rep.h
+++ b/lib/format_pool/disk_rep.h
@@ -20,6 +20,8 @@
 #include "metadata.h"
 #include "pool.h"
 
+#define MINOR_OFFSET 65536
+
 /* From NSP.cf */
 #define NSPMajorVersion	4
 #define NSPMinorVersion	1
diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c
index f67e955ec..eddc690a3 100644
--- a/lib/format_pool/import_export.c
+++ b/lib/format_pool/import_export.c
@@ -108,7 +108,7 @@ int import_pool_lvs(struct volume_group *vg, struct pool *mem, struct list *pls)
 		/* for pool a minor of 0 is dynamic */
 		if (pl->pd.pl_minor) {
 			lv->status |= FIXED_MINOR;
-			lv->minor = pl->pd.pl_minor;
+			lv->minor = pl->pd.pl_minor + MINOR_OFFSET;
 		} else {
 			lv->minor = -1;
 		}