Rename old segtypes files to segtype.

diff --git a/WHATS_NEW b/WHATS_NEW
index 83fe0dc649314f7f06e4faabb2c4e9dce085566d..f605e5efc3e2e6f939973e14ec24db694529c3c9 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.00.24 - 
 =====================================
+  Rename old segtypes files to segtype.
   Some fixes to memory debugging code.
   Exclude internal commands formats & segtypes from install.
 

diff --git a/include/.symlinks b/include/.symlinks
index 54d27bc6a87c187616263f5f76172f39a2b54df5..723f8a10c64c2112c2fc3f940df710e1fbbc990d 100644 (file)
--- a/include/.symlinks
+++ b/include/.symlinks
@@ -31,7 +31,7 @@
 ../lib/log/log.h
 ../lib/metadata/lv_alloc.h
 ../lib/metadata/metadata.h
-../lib/metadata/segtypes.h
+../lib/metadata/segtype.h
 ../lib/mm/dbg_malloc.h
 ../lib/mm/memlock.h
 ../lib/mm/pool.h

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 75ff735b92b2751bc7fb46d13490fd0fde93e9bf..026b7b1bc76d5f31b5fc5a17b72860c90636c7a4 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -70,7 +70,7 @@ SOURCES =\
        metadata/metadata.c \
        metadata/mirror.c \
        metadata/pv_map.c \
-       metadata/segtypes.c \
+       metadata/segtype.c \
        metadata/snapshot_manip.c \
        misc/crc.c \
        misc/lvm-file.c \

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index f6fb683bda5d5e35fee991a3b63a92e81833a811..6d3165827f04e0853d390b38593d85343cc099dd 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -21,7 +21,7 @@
 #include "lvm-string.h"
 #include "fs.h"
 #include "defaults.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "toolcontext.h"
 #include "targets.h"

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 3610f08ebcb87943e3b8ff2221db48cc32ea44eb..2619f90e7507c9b0d10be27959821952a87dd604 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -33,7 +33,7 @@
 #include "display.h"
 #include "memlock.h"
 #include "str_list.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "lvmcache.h"
 
 #ifdef HAVE_LIBDL

diff --git a/lib/display/display.c b/lib/display/display.c
index 5da2ddc1a029a0a112f0a5f1986b33d91a672e64..08e2dc95d78af5821405ee41061585230b63a2d8 100644 (file)
--- a/lib/display/display.c
+++ b/lib/display/display.c
@@ -18,7 +18,7 @@
 #include "display.h"
 #include "activate.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 #define SIZE_BUF 128
 

diff --git a/lib/error/errseg.c b/lib/error/errseg.c
index a71d2a0e4ef4c0fe96d6d96f4886873542f2d222..303c39a005aa2166a0df5dc1601fe5a32419f7d2 100644 (file)
--- a/lib/error/errseg.c
+++ b/lib/error/errseg.c
@@ -16,7 +16,7 @@
 #include "pool.h"
 #include "list.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "text_export.h"
 #include "text_import.h"

diff --git a/lib/format1/format1.c b/lib/format1/format1.c
index 1fbeda01a005be48a3f67038a57102019b6a2436..60041c79afbc7f28212f8da6deb34c63bba93f96 100644 (file)
--- a/lib/format1/format1.c
+++ b/lib/format1/format1.c
@@ -24,7 +24,7 @@
 #include "lvmcache.h"
 #include "lvm1-label.h"
 #include "format1.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 #define FMT_LVM1_NAME "lvm1"
 

diff --git a/lib/format1/import-export.c b/lib/format1/import-export.c
index 7217794a11e9a14c3df19eb2fea4b6001c948634..92719c6e4e12b4a7604c7c4c7132bfeac54d8017 100644 (file)
--- a/lib/format1/import-export.c
+++ b/lib/format1/import-export.c
@@ -25,7 +25,7 @@
 #include "lvm-string.h"
 #include "filter.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 #include <time.h>
 

diff --git a/lib/format1/import-extents.c b/lib/format1/import-extents.c
index 93225f5bb511ec8ef6ff3a68c9198f3766dbe7b0..f2287f9245ef9f714cf57efce6086b657c589cea 100644 (file)
--- a/lib/format1/import-extents.c
+++ b/lib/format1/import-extents.c
@@ -20,7 +20,7 @@
 #include "disk-rep.h"
 #include "lv_alloc.h"
 #include "display.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 /*
  * After much thought I have decided it is easier,

diff --git a/lib/format_pool/import_export.c b/lib/format_pool/import_export.c
index 8df67939a61f38ace41dc76ae44d2fc4ed1277c4..58be673026c776ff0e40f3eb1c1f7634479ecc45 100644 (file)
--- a/lib/format_pool/import_export.c
+++ b/lib/format_pool/import_export.c
@@ -22,7 +22,7 @@
 #include "lv_alloc.h"
 #include "str_list.h"
 #include "display.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 /* This file contains only imports at the moment... */
 

diff --git a/lib/format_text/export.c b/lib/format_text/export.c
index 2bc168c8d440aef970026a2d0f5e3cff1bda45d7..f1e6710fa128fa52a69a5a739b26f9ff0efce9ed 100644 (file)
--- a/lib/format_text/export.c
+++ b/lib/format_text/export.c
@@ -20,7 +20,7 @@
 #include "pool.h"
 #include "display.h"
 #include "lvm-string.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "text_export.h"
 
 #include <stdarg.h>

diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c
index cccf448a75a3c145ba78845dc5e02945323530eb..cd254c673b02701b7f8550c02871e8e7a82db10d 100644 (file)
--- a/lib/format_text/import_vsn1.c
+++ b/lib/format_text/import_vsn1.c
@@ -22,7 +22,7 @@
 #include "toolcontext.h"
 #include "lvmcache.h"
 #include "lv_alloc.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "text_import.h"
 
 typedef int (*section_fn) (struct format_instance * fid, struct pool * mem,

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 8d649b5fdd488a3f818203c15e2771f30f7fbfb8..a95b588ee05e99b15b5ffd66d5cb31f618f20555 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -21,7 +21,7 @@
 #include "toolcontext.h"
 #include "lv_alloc.h"
 #include "display.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 /*
  * These functions adjust the pe counts in pv's

diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 61b05eb60e10999e7b6509f6d613cd3b401e0c9c..b7cc6457d56c48c9f18d9b93c3cf44ca4ccce5ed 100644 (file)
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -18,7 +18,7 @@
 #include "toolcontext.h"
 #include "lv_alloc.h"
 #include "str_list.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 /*
  * Attempt to merge two adjacent segments.

diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c
index cf76dea0bdd1f79a07a9ea748ea9531a13033c2d..3e6fb064e5e2e007fdb4f00f9d0ddf9434e52508 100644 (file)
--- a/lib/metadata/mirror.c
+++ b/lib/metadata/mirror.c
@@ -16,7 +16,7 @@
 #include "lib.h"
 #include "metadata.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "activate.h"
 

diff --git a/lib/metadata/segtypes.c b/lib/metadata/segtype.c
similarity index 97%
rename from lib/metadata/segtypes.c
rename to lib/metadata/segtype.c
index 0024e29cea6ead4c01f7962ed13e07ff4b7cb4d1..b60d81d810f589f2b5c7db9ab107c5d0061ad3a9 100644 (file)
--- a/lib/metadata/segtypes.c
+++ b/lib/metadata/segtype.c
@@ -15,7 +15,7 @@
 
 #include "lib.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 struct segment_type *get_segtype_from_string(struct cmd_context *cmd,
                                             const char *str)

diff --git a/lib/metadata/segtypes.h b/lib/metadata/segtype.h
similarity index 96%
rename from lib/metadata/segtypes.h
rename to lib/metadata/segtype.h
index ef606e52ea91e33967f48b9de57382be82a0be6b..4af48b92613a8e676696756512a6f3b46a9199ac 100644 (file)
--- a/lib/metadata/segtypes.h
+++ b/lib/metadata/segtype.h
@@ -85,4 +85,8 @@ struct segment_type *init_snapshot_segtype(struct cmd_context *cmd);
 struct segment_type *init_mirrored_segtype(struct cmd_context *cmd);
 #endif
 
+#ifdef CRYPT_INTERNAL
+struct segment_type *init_crypt_segtype(struct cmd_context *cmd);
+#endif
+
 #endif

diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c
index e56041da79d4d3406f04325db6bf36eb0387cc8a..c47a3dda46a38c0429659b33251b5bfa139c7d74 100644 (file)
--- a/lib/mirror/mirrored.c
+++ b/lib/mirror/mirrored.c
@@ -18,7 +18,7 @@
 #include "list.h"
 #include "toolcontext.h"
 #include "metadata.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "text_export.h"
 #include "text_import.h"

diff --git a/lib/report/report.c b/lib/report/report.c
index e448eff219a3a3ffaaf8cba44fc8f602c9f5fd85..9085ff1c07dedda17cf8dfbceac052234b29eaf2 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -21,7 +21,7 @@
 #include "lvm-string.h"
 #include "display.h"
 #include "activate.h"
-#include "segtypes.h"
+#include "segtype.h"
 
 /* 
  * For macro use

diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index b446026caf198686dcfa291a9a4d5deaec91b77c..82e8a27e2861aa36808261a005b09f7a051b44a5 100644 (file)
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -18,7 +18,7 @@
 #include "list.h"
 #include "toolcontext.h"
 #include "metadata.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "text_export.h"
 #include "config.h"
 #include "activate.h"

diff --git a/lib/striped/striped.c b/lib/striped/striped.c
index 79a3f1bb3394b4b0cdb7b2d8e688e526a4ca1ccd..ccd369d384e7b54cc473ffdac32bdc79e40d36ec 100644 (file)
--- a/lib/striped/striped.c
+++ b/lib/striped/striped.c
@@ -17,7 +17,7 @@
 #include "pool.h"
 #include "list.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "text_export.h"
 #include "text_import.h"

diff --git a/lib/zero/zero.c b/lib/zero/zero.c
index 962bf3e4b77514dba6d61a7772aa7aa8271c7b98..5524ea87db31cc6ccf7a05b5080b073aa2392c85 100644 (file)
--- a/lib/zero/zero.c
+++ b/lib/zero/zero.c
@@ -16,7 +16,7 @@
 #include "pool.h"
 #include "list.h"
 #include "toolcontext.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "display.h"
 #include "text_export.h"
 #include "text_import.h"

diff --git a/tools/tools.h b/tools/tools.h
index acab0380ebd2db55c433856515b16f8b74843007..24ac70044437a85f01e179c69df87710aa5581fb 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -43,7 +43,7 @@
 #include "lvm-file.h"
 #include "lvm-string.h"
 #include "pool.h"
-#include "segtypes.h"
+#include "segtype.h"
 #include "str_list.h"
 #include "toolcontext.h"
 #include "toollib.h"