ab24554e1c
* Added install hooks for keystone. * Fixed merge conflicts related to mysql reorg. * Resolved more mysql merge conflicts. * Resolved merge conflicts related to rabbitmq refactor. * Added configure-the-things script to tests * Turned off horizon for now. * Disabled a bunch of daemons -- can reenable one by one as we verify them to be working. * Added configure script, but exit 0 before configuring mysql -- there's something broken about the pathing. * Fixed stray 'sudo' in configure hook, which was causing problems. * Split uwsgi daemons into service specific directories Enable all daemons again. * Add .d configuration for nova, keystone and glance * Misc updates * Drop nova-consoleauth as its deprecated at rocky * Rename neutron-manage -> neutron-db-manage * Add neutron and nova hypervisor agents and configuration * Add configuration files for new agents * Update worker configuration * Add libvirt support to nova parts * Add fake sudo command to unconfuse things
32 lines
965 B
Diff
32 lines
965 B
Diff
From fdf38dcad424c00d39b5c128ddb06b93606a639b Mon Sep 17 00:00:00 2001
|
|
From: James Page <james.page@ubuntu.com>
|
|
Date: Wed, 19 Sep 2018 09:13:48 +0200
|
|
Subject: [PATCH] ovs-kmod-ctl: source ovs-lib dynamically
|
|
|
|
Determine installation location of ovs-lib using runtime location
|
|
of script, rather than build-time parameters.
|
|
---
|
|
utilities/ovs-kmod-ctl.in | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/utilities/ovs-kmod-ctl.in b/utilities/ovs-kmod-ctl.in
|
|
index 13ccfcf73..19f100964 100644
|
|
--- a/utilities/ovs-kmod-ctl.in
|
|
+++ b/utilities/ovs-kmod-ctl.in
|
|
@@ -14,7 +14,11 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
-. "@pkgdatadir@/scripts/ovs-lib" || exit 1
|
|
+case $0 in
|
|
+ */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;;
|
|
+ *) dir0=./ ;;
|
|
+esac
|
|
+. "$dir0/ovs-lib" || exit 1
|
|
|
|
for dir in "$sbindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do
|
|
case :$PATH: in
|
|
--
|
|
2.17.1
|
|
|