[openstack-quantum/el6-grizzly] Fix previous quantum-ovs-cleanup change

Terry Wilson otherwiseguy at fedoraproject.org
Thu Oct 24 18:59:29 UTC 2013


commit 1f49b733b821a8b329e1d3b4fc7338c958555888
Author: Terry Wilson <twilson at redhat.com>
Date:   Thu Oct 24 13:52:00 2013 -0500

    Fix previous quantum-ovs-cleanup change

 openstack-quantum.spec   |    5 ++++-
 quantum-ovs-cleanup.init |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index d7b0b89..ac217f1 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-quantum
 Version:	2013.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	OpenStack Networking Service
 
 Group:		Applications/System
@@ -729,6 +729,9 @@ fi
 
 
 %changelog
+* Thu Oct 24 2013 Terry Wilson <twilson at redhat.com> - 2013.1.4-3
+- Fix quantum-ovs-cleanup script
+
 * Thu Oct 24 2013 Terry Wilson <twilson at redhat.com> - 2013.1.4-2
 - Ensure that quantum-ovs-cleanup completes before exiting (rhbz#1022578)
 
diff --git a/quantum-ovs-cleanup.init b/quantum-ovs-cleanup.init
index ec7b526..5f6cbba 100644
--- a/quantum-ovs-cleanup.init
+++ b/quantum-ovs-cleanup.init
@@ -21,7 +21,7 @@ lockfile=/var/lock/subsys/$prog
 start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
-    runuser -s /bin/bash quantum $exec --log-file /var/log/$proj/ovs-cleanup.log --config-file /usr/share/$proj/$proj-dist.conf --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null
+    runuser -s /bin/bash quantum -c "$exec --log-file /var/log/$proj/ovs-cleanup.log --config-file /etc/$proj/$proj.conf --config-file $config &>/dev/null"
     retval=$?
     [ $retval -eq 0 ] && touch $lockfile
     return $retval


More information about the scm-commits mailing list