summaryrefslogtreecommitdiffstats
path: root/tools/lvm.c
diff options
context:
space:
mode:
authorAlasdair Kergon <agk@redhat.com>2002-01-17 16:39:24 +0000
committerAlasdair Kergon <agk@redhat.com>2002-01-17 16:39:24 +0000
commitfae0c5764fce6fe0b2957822b8bea987e54f7022 (patch)
tree98e473b7e1caa59c0a9bb1a07027fd873e0ed8e5 /tools/lvm.c
parent444b7d2360327bb746ecbf63d4b289a37f8407e8 (diff)
downloadlvm2-fae0c5764fce6fe0b2957822b8bea987e54f7022.tar.gz
lvm2-fae0c5764fce6fe0b2957822b8bea987e54f7022.tar.xz
lvm2-fae0c5764fce6fe0b2957822b8bea987e54f7022.zip
Support --version argument and 'version' shell command.
Diffstat (limited to 'tools/lvm.c')
-rw-r--r--tools/lvm.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/lvm.c b/tools/lvm.c
index 1feca150..c98c66cb 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -9,6 +9,7 @@
#include "defaults.h"
#include "lvm1_label.h"
#include "label.h"
+#include "version.h"
#include "stub.h"
@@ -537,6 +538,19 @@ static int merge_synonym(int oldarg, int newarg)
return 1;
}
+int version(int argc, char **argv)
+{
+ char version[80];
+
+ log_error("LVM version: %s", LVM_VERSION);
+ if (library_version(version, sizeof(version)))
+ log_error("Library version: %s", version);
+ if (driver_version(version, sizeof(version)))
+ log_error("Driver version: %s", version);
+
+ return ECMD_PROCESSED;
+}
+
static int process_common_commands(struct command *com)
{
_current_settings = _default_settings;
@@ -565,9 +579,7 @@ static int process_common_commands(struct command *com)
}
if (arg_count(version_ARG)) {
- /* FIXME: Add driver and software version */
- log_error("%s: ", com->name);
- return ECMD_PROCESSED;
+ return version(0, (char **)NULL);
}
if (arg_count(autobackup_ARG)) {