From 4ede3f0c8ced2b48ffbc54360087d145301007ae Mon Sep 17 00:00:00 2001 From: Alexey Shabalin Date: Thu, 24 Sep 2020 19:16:41 +0300 Subject: [PATCH] Use local LSB functions Avoid execute initlog with error: systemd[1]: Starting Open vSwitch Database Unit... echo[14984]: OVS_USER_ID=openvswitch:openvswitch > /run/openvswitch.useropts ovs-ctl[15038]: Starting ovsdb-server succeeded ovs-ctl[14987]: Starting ovsdb-server [ DONE ] ovs-vsctl[15039]: ovs|00001|vsctl|INFO|Called as ovs-vsctl --no-wait -- init -- set Open_vSwitch . db-version=8> ovs_vsctl[15044]: initlog: ovs_vsctl[15044]: execvp ovs_vsctl[15044]: : No such file or directory ovs-ctl[14987]: Configuring Open vSwitch system IDs ovs-ctl[15044]: initlog: execvp: No such file or directory ovs-ctl[15046]: Configuring Open vSwitch system IDs failed ovs-ctl[14987]: [FAILED] --- utilities/ovs-lib.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index 3eda01d3c..66d051dd7 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -90,22 +90,22 @@ elif test -e /lib/lsb/init-functions; then fi # Implement missing functions (e.g. OpenSUSE lacks 'action'). -if type log_success_msg >/dev/null 2>&1; then :; else +#if type log_success_msg >/dev/null 2>&1; then :; else log_success_msg () { printf '%s.\n' "$*" } -fi -if type log_failure_msg >/dev/null 2>&1; then :; else +#fi +#if type log_failure_msg >/dev/null 2>&1; then :; else log_failure_msg () { printf '%s ... failed!\n' "$*" } -fi -if type log_warning_msg >/dev/null 2>&1; then :; else +#fi +#if type log_warning_msg >/dev/null 2>&1; then :; else log_warning_msg () { printf '%s ... (warning).\n' "$*" } -fi -if type action >/dev/null 2>&1; then :; else +#fi +#if type action >/dev/null 2>&1; then :; else action () { STRING=$1 shift @@ -118,7 +118,7 @@ if type action >/dev/null 2>&1; then :; else fi return $rc } -fi +#fi ## ------- ## ## Daemons ## -- 2.33.0