From 3d4159b6bf25ab0fa85fb3677edcfd7c4c6fbb0c Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Wed, 6 Oct 2004 12:36:47 +0000 Subject: [PATCH] Make clvmd -V display the lvm version number too rather than just the protocol version (which is not that useful and doesn't change very often). --- WHATS_NEW | 1 + daemons/clvmd/clvmd.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a54d1929b..c7a5d0b64 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -3,6 +3,7 @@ Version 2.00.26 - Improve clvmd error reporting during startup. Make clvmd cope with large gaps in node numbers IDs. Make clvmd initialisation cope better with debugging output. + clvmd -V now displays lvm version too. Version 2.00.25 - 29th September 2004 diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index e0db11c52..e92a1cee6 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -39,6 +39,7 @@ #include "clvmd-comms.h" #include "lvm-functions.h" #include "clvm.h" +#include "../../tools/version.h" #include "clvmd.h" #include "libdlm.h" #include "system-lv.h" @@ -140,8 +141,10 @@ static void usage(char *prog, FILE *file) /* Called to signal the parent how well we got on during initialisation */ static void child_init_signal(int status) { - write(child_pipe[1], &status, sizeof(status)); - close(child_pipe[1]); + if (child_pipe[1]) { + write(child_pipe[1], &status, sizeof(status)); + close(child_pipe[1]); + } if (status) exit(status); } @@ -184,7 +187,8 @@ int main(int argc, char *argv[]) break; case 'V': - printf("\nCluster LVM Daemon version %d.%d.%d\n\n", + printf("Cluster LVM daemon version: %s\n", LVM_VERSION); + printf("Protocol version: %d.%d.%d\n", CLVMD_MAJOR_VERSION, CLVMD_MINOR_VERSION, CLVMD_PATCH_VERSION); exit(1); -- 2.43.5