Change in vdsm[master]: vdsm-tool usage: Adding path variable to init script
ybronhei at redhat.com
ybronhei at redhat.com
Mon Jul 8 08:11:40 UTC 2013
Yaniv Bronhaim has uploaded a new change for review.
Change subject: vdsm-tool usage: Adding path variable to init script
......................................................................
vdsm-tool usage: Adding path variable to init script
Change-Id: Ia5c07ee9bdc99a5b6d491e2ca2be99d3cf04c73f
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M vdsm/vdsmd.init.in
1 file changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/16549/1
diff --git a/vdsm/vdsmd.init.in b/vdsm/vdsmd.init.in
index ac1452e..28d0e84 100755
--- a/vdsm/vdsmd.init.in
+++ b/vdsm/vdsmd.init.in
@@ -44,6 +44,7 @@
QCONF=/etc/libvirt/qemu.conf
LDCONF=/etc/sysconfig/libvirtd
QLCONF=/etc/libvirt/qemu-sanlock.conf
+VDSM_TOOL=@BINDIR@/vdsm-tool
is_coredump=`$GETCONFITEM $CONF_FILE vars core_dump_enable false | tr A-Z a-z`
[ "$is_coredump" != "true" ] && is_coredump=false
@@ -127,13 +128,13 @@
for srv in $CONFLICTING_SERVICES
do
- /usr/bin/vdsm-tool service-disable "$srv"
- if /usr/bin/vdsm-tool service-status "$srv" > /dev/null 2>&1;
+ "$VDSM_TOOL" service-disable "$srv"
+ if "$VDSM_TOOL" service-status "$srv" > /dev/null 2>&1;
then
if [ "$srv" = "libvirt-guests" ]; then
/bin/rm -f /var/lock/subsys/libvirt-guests
else
- /usr/bin/vdsm-tool service-stop "$srv"
+ "$VDSM_TOOL" service-stop "$srv"
fi
fi
done
@@ -155,10 +156,10 @@
for srv in $NEEDED_SERVICES
do
- if ! /usr/bin/vdsm-tool service-status "$srv" > /dev/null 2>&1;
+ if ! "$VDSM_TOOL" service-status "$srv" > /dev/null 2>&1;
then
echo "Starting $srv..."
- /usr/bin/vdsm-tool service-start "$srv"
+ "$VDSM_TOOL" service-start "$srv"
ret_val=$?
if [ $ret_val -ne 0 ]
then
@@ -306,7 +307,7 @@
log_failure_msg "$prog: Missing certificates, $prog not registered"
return 6
fi
- /usr/bin/vdsm-tool validate-ovirt-certs
+ "$VDSM_TOOL" validate-ovirt-certs
fi
#
@@ -416,7 +417,7 @@
ovirt_store_config "$lconf" "$qconf" "$ldconf" "$llogr"
- /usr/bin/vdsm-tool service-restart libvirtd
+ "$VDSM_TOOL" service-restart libvirtd
#
# finished reconfiguration, do not trigger
@@ -477,7 +478,7 @@
return $ret_val
fi
- vdsm-tool nwfilter
+ "$VDSM_TOOL" nwfilter
ret_val=$?
if [ $ret_val -ne 0 ]
then
@@ -485,7 +486,7 @@
return $ret_val
fi
- vdsm-tool dummybr
+ "$VDSM_TOOL" dummybr
ret_val=$?
if [ $ret_val -ne 0 ]
then
@@ -494,7 +495,7 @@
fi
if ! has_systemd; then
- /usr/bin/vdsm-tool load-needed-modules
+ "$VDSM_TOOL" load-needed-modules
fi
/sbin/sysctl -q -p /etc/sysctl.d/vdsm
--
To view, visit http://gerrit.ovirt.org/16549
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5c07ee9bdc99a5b6d491e2ca2be99d3cf04c73f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
More information about the vdsm-patches
mailing list