Change in vdsm[master]: libvirt_configure: move unpersist up
dougsland at redhat.com
dougsland at redhat.com
Fri Mar 21 20:28:05 UTC 2014
Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: libvirt_configure: move unpersist up
......................................................................
libvirt_configure: move unpersist up
On commit b4efa0036e065 we have fixed the failure on
mv command to logrotate file but a few lines above vdsm
executes a sed which also requires the file be unpersist before it.
This patch move the unpersist command some lines above.
Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M lib/vdsm/tool/libvirt_configure.sh.in
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/25990/1
diff --git a/lib/vdsm/tool/libvirt_configure.sh.in b/lib/vdsm/tool/libvirt_configure.sh.in
index eacb37c..db713f9 100755
--- a/lib/vdsm/tool/libvirt_configure.sh.in
+++ b/lib/vdsm/tool/libvirt_configure.sh.in
@@ -298,16 +298,16 @@
}
## end of configuration section by vdsm
EOF
- # Backup (comment) original logrotate.d/libvirtd
- @SED_PATH@ -i 's/^/# VDSM backup/' "$llogr"
- @SED_PATH@ -e "/# vdsm/,/# end vdsm/d" "${llogr}" >> "${stanza}"
- local oldmod=`/usr/bin/stat --format=%a "${llogr}"`
-
# unpersist cmd is remove_config on ovirt-functions
if isOvirtNode; then
. /usr/libexec/ovirt-functions
remove_config "${llogr}"
fi
+ # Backup (comment) original logrotate.d/libvirtd
+ @SED_PATH@ -i 's/^/# VDSM backup/' "$llogr"
+ @SED_PATH@ -e "/# vdsm/,/# end vdsm/d" "${llogr}" >> "${stanza}"
+ local oldmod=`/usr/bin/stat --format=%a "${llogr}"`
+
@MV_PATH@ "${stanza}" "${llogr}"
if [ -n "${oldmod}" ]; then
--
To view, visit http://gerrit.ovirt.org/25990
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea6ae62990a414f52225ad690ec9c21060c2a48d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
More information about the vdsm-patches
mailing list