Define localstatedir for ovs compilation
By default localstatedir is PREFIX/var, which means logs are placed to /usr/var/log/openvswitch directory. This patch redefines explicitly to put the log files into /var/log/openvswitch, also /var/run/openvswitch will be correctly used for pid file. Change-Id: I1a02e8f33e745da82addfbf34efd487adf726e71 Closes-Bug: 1566569
This commit is contained in:
parent
3791469ceb
commit
92af3114a7
@ -35,16 +35,22 @@ function load_module {
|
||||
# Accepts two parameters:
|
||||
# - first one is True, modules are built and installed.
|
||||
# - second optional parameter defines prefix for ovs compilation
|
||||
# - third optional parameter defines localstatedir for ovs single machine runtime
|
||||
# Env variables OVS_REPO_NAME, OVS_REPO and OVS_BRANCH must be set
|
||||
function compile_ovs {
|
||||
local _pwd=$PWD
|
||||
local build_modules=${1:-True}
|
||||
local prefix=$2
|
||||
local localstatedir=$3
|
||||
|
||||
if [ -n "$prefix" ]; then
|
||||
prefix="--prefix=$prefix"
|
||||
fi
|
||||
|
||||
if [ -n "$localstatedir" ]; then
|
||||
localstatedir="--localstatedir=$localstatedir"
|
||||
fi
|
||||
|
||||
cd $DEST
|
||||
if [ ! -d $OVS_REPO_NAME ] ; then
|
||||
git clone $OVS_REPO
|
||||
@ -67,9 +73,9 @@ function compile_ovs {
|
||||
fi
|
||||
if [ ! -f config.status ] || [ configure -nt config.status ] ; then
|
||||
if [[ "$build_modules" == "True" ]]; then
|
||||
./configure $prefix --with-linux=/lib/modules/$(uname -r)/build
|
||||
./configure $prefix $localstatedir --with-linux=/lib/modules/$(uname -r)/build
|
||||
else
|
||||
./configure $prefix
|
||||
./configure $prefix $localstatedir
|
||||
fi
|
||||
fi
|
||||
make -j$[$(nproc) + 1]
|
||||
|
@ -33,7 +33,7 @@ then
|
||||
uninstall_package $package
|
||||
fi
|
||||
done
|
||||
compile_ovs True /usr
|
||||
compile_ovs True /usr /var
|
||||
start_new_ovs
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user