From: Ondrej Kozina <okozina@redhat.com>
Date: Wed, 14 Aug 2013 13:46:32 +0000 (+0200)
Subject: - use LVMBIN to retrieve LVM2 version info
X-Git-Tag: v0.1.7~8^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aba7f9b8a10f99e797c35ca743e7c05f4e086e6f;p=thirdparty%2Fsnapper.git

- use LVMBIN to retrieve LVM2 version info
---

diff --git a/configure.ac b/configure.ac
index b6c4f222..ec6feab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_PATH_PROG([LVCREATEBIN], [lvcreate], [/sbin/lvcreate])
 AC_PATH_PROG([LVREMOVEBIN], [lvremove], [/sbin/lvremove])
 AC_PATH_PROG([LVSBIN], [lvs], [/sbin/lvs])
 AC_PATH_PROG([LVCHANGEBIN], [lvchange], [/sbin/lvchange])
+AC_PATH_PROG([LVMBIN], [lvm], [/sbin/lvm])
 
 AC_DEFINE_UNQUOTED([CHSNAPBIN], ["$CHSNAPBIN"], [Path of chsnap program.])
 AC_DEFINE_UNQUOTED([CPBIN], ["$CPBIN"], [Path of cp program.])
@@ -47,6 +48,7 @@ AC_DEFINE_UNQUOTED([LVCREATEBIN], ["$LVCREATEBIN"], [Path of lvcreate program.])
 AC_DEFINE_UNQUOTED([LVREMOVEBIN], ["$LVREMOVEBIN"], [Path of lvremove program.])
 AC_DEFINE_UNQUOTED([LVSBIN], ["$LVSBIN"], [Path of lvs program.])
 AC_DEFINE_UNQUOTED([LVCHANGEBIN], ["$LVCHANGEBIN"], [Path of lvchange program.])
+AC_DEFINE_UNQUOTED([LVMBIN], ["$LVMBIN"], [Path of lvm program.])
 
 dnl Automake 1.11 enables silent compilation
 dnl Disable it by "configure --disable-silent-rules" or "make V=1"
diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc
index 6012c25e..6707b57d 100644
--- a/snapper/Lvm.cc
+++ b/snapper/Lvm.cc
@@ -354,7 +354,7 @@ namespace snapper
     LvmCapabilities::LvmCapabilities()
 	: ignoreactivationskip(), time_support(false)
     {
-	SystemCmd cmd(string(LVSBIN " --version"));
+	SystemCmd cmd(string(LVMBIN " version"));
 
 	if (cmd.retcode() != 0)
 	{