[Ocfs2-tools-devel] [PATCH 19/19] Ocfs2-tools: Add miscellaneous changes needed for o2info.

[Tristan Ye]

Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 CREDITS                                   |    3 +++
 Makefile                                  |    2 +-
 configure.in                              |    1 +
 debian/ocfs2-tools.install                |    2 ++
 debian/ocfs2-tools.manpages               |    1 +
 vendor/common/ocfs2-tools.spec-generic.in |    2 ++
 6 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/CREDITS b/CREDITS
index d15ca67..042b8e1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -29,6 +29,9 @@ ocfs2cdsl:
 ocfs2console:
 	Written by Manish Singh.
 
+o2info:
+	Written by Tristan Ye.
+
 ocfs2console/blkid:
 	From e2fsprogs 1.37, by Theodore Ts'o and Andreas Dilger.
 
diff --git a/Makefile b/Makefile
index 88106fb..8c42ae6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ CHKCONFIG_DEP = chkconfig
 COMPILE_PY = 1
 endif
 
-SUBDIRS = include libtools-internal libo2dlm libo2cb libocfs2 fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 ocfs2_controld o2image listuuid sizetest extras fswreck patches
+SUBDIRS = include libtools-internal libo2dlm libo2cb libocfs2 fsck.ocfs2 mkfs.ocfs2 mounted.ocfs2 tunefs.ocfs2 debugfs.ocfs2 o2cb_ctl ocfs2_hb_ctl mount.ocfs2 ocfs2_controld o2image listuuid sizetest extras fswreck patches o2info
 
 ifdef BUILD_OCFS2CONSOLE
 SUBDIRS += ocfs2console
diff --git a/configure.in b/configure.in
index 458b55a..30ea831 100644
--- a/configure.in
+++ b/configure.in
@@ -433,6 +433,7 @@ ocfs2_hb_ctl/ocfs2_hb_ctl.8
 ocfs2console/ocfs2console.8
 tunefs.ocfs2/tunefs.ocfs2.8
 o2image/o2image.8
+o2info/o2info.1
 libo2cb/o2cb.7
 vendor/common/ocfs2-tools.spec-generic
 ])
diff --git a/debian/ocfs2-tools.install b/debian/ocfs2-tools.install
index 4ca7d34..6c74383 100644
--- a/debian/ocfs2-tools.install
+++ b/debian/ocfs2-tools.install
@@ -6,6 +6,7 @@ sbin/mounted.ocfs2
 sbin/o2cb_ctl
 sbin/ocfs2_hb_ctl
 sbin/tunefs.ocfs2
+usr/bin/o2info
 usr/share/man/man8/debugfs.ocfs2.8
 usr/share/man/man8/fsck.ocfs2.8
 usr/share/man/man8/fsck.ocfs2.checks.8
@@ -16,3 +17,4 @@ usr/share/man/man7/o2cb.7
 usr/share/man/man8/o2cb_ctl.8
 usr/share/man/man8/ocfs2_hb_ctl.8
 usr/share/man/man8/tunefs.ocfs2.8
+usr/share/man/man1/o2info.1
diff --git a/debian/ocfs2-tools.manpages b/debian/ocfs2-tools.manpages
index 439fa68..22c1560 100644
--- a/debian/ocfs2-tools.manpages
+++ b/debian/ocfs2-tools.manpages
@@ -8,3 +8,4 @@ debian/tmp/usr/share/man/man8/o2cb_ctl.8
 debian/tmp/usr/share/man/man8/ocfs2_hb_ctl.8
 debian/tmp/usr/share/man/man8/o2image.8
 debian/tmp/usr/share/man/man7/o2cb.7
+debian/tmp/usr/share/man/man1/o2info.1
diff --git a/vendor/common/ocfs2-tools.spec-generic.in b/vendor/common/ocfs2-tools.spec-generic.in
index 3e9b46a..0192c48 100644
--- a/vendor/common/ocfs2-tools.spec-generic.in
+++ b/vendor/common/ocfs2-tools.spec-generic.in
@@ -119,6 +119,7 @@ fi
 /sbin/mount.ocfs2
 /sbin/o2image
 /sbin/ocfs2_hb_ctl
+/usr/bin/o2info
 /etc/init.d/o2cb
 /etc/init.d/ocfs2
 %config(noreplace) /etc/sysconfig/o2cb
@@ -133,6 +134,7 @@ fi
 /usr/share/man/man8/ocfs2_hb_ctl.8.gz
 /usr/share/man/man8/o2image.8.gz
 /usr/share/man/man7/o2cb.7.gz
+/usr/share/man/man1/o2info.1.gz
 
 
 %files -n ocfs2console
-- 
1.5.5