diff mbox series

[ovs-dev,v2] ovs-lib: Remove second parameter for stop_daemon

Message ID 1612181085-10332-1-git-send-email-wangyunjian@huawei.com
State Accepted
Headers show
Series [ovs-dev,v2] ovs-lib: Remove second parameter for stop_daemon | expand

Commit Message

wangyunjian Feb. 1, 2021, 12:04 p.m. UTC 
From: Yunjian Wang <wangyunjian@huawei.com>

The stop_daemon no longer takes second argument after
commit f3e24610ea18 ("Remove OVN.").

Fixes: f3e24610ea18 ("Remove OVN.")
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
---
 utilities/ovs-lib.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ilya Maximets Feb. 2, 2021, 5:22 p.m. UTC | #1 
On 2/1/21 1:04 PM, wangyunjian wrote:
> From: Yunjian Wang <wangyunjian@huawei.com>
> 
> The stop_daemon no longer takes second argument after
> commit f3e24610ea18 ("Remove OVN.").
> 
> Fixes: f3e24610ea18 ("Remove OVN.")
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
> ---
>  utilities/ovs-lib.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> index f7e975674..ab38ece45 100644
> --- a/utilities/ovs-lib.in
> +++ b/utilities/ovs-lib.in
> @@ -273,7 +273,7 @@ stop_daemon () {
>                  case $action in
>                      EXIT)
>                          action "Exiting $1 ($pid)" \
> -                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit $2
> +                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit
>                          # The above command could have resulted in delayed
>                          # daemon segfault. And if a monitor is running, it
>                          # would restart the daemon giving it a new pid.
> 

Thanks!

Applied to master and branch-2.15.

It doesn't apply cleanly on older branches and since it's not
actually important I decided to not backport further.

If you think that it needs to be backported, please, send a
backported patch for branch-2.14 with 'PATCH branch-2.14'
as a subject prefix.

Best regards, Ilya Maximets.
diff mbox series

Patch

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index f7e975674..ab38ece45 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -273,7 +273,7 @@  stop_daemon () {
                 case $action in
                     EXIT)
                         action "Exiting $1 ($pid)" \
-                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit $2
+                            ${bindir}/ovs-appctl -T 1 -t $rundir/$1.$pid.ctl exit
                         # The above command could have resulted in delayed
                         # daemon segfault. And if a monitor is running, it
                         # would restart the daemon giving it a new pid.