Zhou Zheng Sheng has uploaded a new change for review.
Change subject: Packaging: fix libvirt configuration
......................................................................
Packaging: fix libvirt configuration
The help string "=FILE" is incorrectly added to the name of the
configure option --with-libvirt-service-default. So This patch moves
"=FILE" to help string.
Another problem is we disabled libvirt-sanlock in Ubuntu, so QLCONF is
set to "/dev/null", but later we need to grep "${BY_VDSM_VERS}" from
QLCONF to confirm libvirt is configured. grep returns 1 for QLCONF but
actually libvirt is configured. This patch does not set QLCONF to
"/dev/null", this is harmless because when libvirt-sanlock is not
enabled, no one reads and cares QLCONF actually.
Change-Id: I34fa3764b999e71186171931664b0481b2ef3a15
Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
---
M configure.ac
M lib/vdsm/tool/libvirt_configure.sh.in
2 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/20168/1
diff --git a/configure.ac b/configure.ac
index a1a5465..04e5d2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,9 +100,9 @@
AC_SUBST([QEMUGROUP], ["${with_qemu_group}"])
AC_ARG_WITH(
- [libvirt-service-default=FILE],
+ [libvirt-service-default],
[AS_HELP_STRING(
- [--with-libvirt-service-default],
+ [--with-libvirt-service-default=FILE],
[configure full path of libvirt service environment file.
@<:@SYSCONFDIR/sysconfig/libvirtd@:>@]
)],
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in
b/lib/vdsm/tool/libvirt_configure.sh.in
index ed8a466..467ef27 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -39,8 +39,6 @@
# continue to use this string.
BY_VDSM_VERS="4.10.3"
-[ "${ENABLE_LIBVIRT_SANLOCK}" = "yes" ] ||
QLCONF="/dev/null"
-
# trigger for reconfiguration
FORCE_RECONFIGURE="@VDSMLIBDIR@/reconfigure"
--
To view, visit
http://gerrit.ovirt.org/20168
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34fa3764b999e71186171931664b0481b2ef3a15
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>