[ovs-dev,ovn] ovn-lib: Fix the wrong ovn_etcdir path
diff mbox series

Message ID 20190916125434.29155-1-nusiddiq@redhat.com
State Accepted
Headers show
Series
  • [ovs-dev,ovn] ovn-lib: Fix the wrong ovn_etcdir path
Related show

Commit Message

Numan Siddique Sept. 16, 2019, 12:54 p.m. UTC
From: Numan Siddique <nusiddiq@redhat.com>

'sysconfdir' is used instead of 'ovn_sysconfdir' to determine the ovn_etcdir
path.

Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
---
 utilities/ovn-lib.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dumitru Ceara Sept. 16, 2019, 1 p.m. UTC | #1
On Mon, Sep 16, 2019 at 2:55 PM <nusiddiq@redhat.com> wrote:
>
> From: Numan Siddique <nusiddiq@redhat.com>
>
> 'sysconfdir' is used instead of 'ovn_sysconfdir' to determine the ovn_etcdir
> path.
>
> Signed-off-by: Numan Siddique <nusiddiq@redhat.com>

Looks good to me, thanks!

Acked-by: Dumitru Ceara <dceara@redhat.com>

> ---
>  utilities/ovn-lib.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in
> index 50111a76b..a8fc9d6db 100644
> --- a/utilities/ovn-lib.in
> +++ b/utilities/ovn-lib.in
> @@ -25,7 +25,7 @@
>  ovn_logdir=${OVN_LOGDIR-'@LOGDIR@'}                 # /var/log/ovn
>  ovn_rundir=${OVN_RUNDIR-'@OVN_RUNDIR@'}                 # /var/run/ovn
>  ovn_sysconfdir=${OVN_SYSCONFDIR-'@sysconfdir@'}     # /etc
> -ovn_etcdir=$sysconfdir/ovn                          # /etc/ovn
> +ovn_etcdir=$ovn_sysconfdir/ovn                      # /etc/ovn
>  ovn_datadir=${OVN_PKGDATADIR-'@pkgdatadir@'}        # /usr/share/ovn
>  ovn_bindir=${OVN_BINDIR-'@bindir@'}                 # /usr/bin
>  ovn_sbindir=${OVN_SBINDIR-'@sbindir@'}              # /usr/sbin
> --
> 2.21.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Mark Michelson Sept. 16, 2019, 3:32 p.m. UTC | #2
On 9/16/19 9:00 AM, Dumitru Ceara wrote:
> On Mon, Sep 16, 2019 at 2:55 PM <nusiddiq@redhat.com> wrote:
>>
>> From: Numan Siddique <nusiddiq@redhat.com>
>>
>> 'sysconfdir' is used instead of 'ovn_sysconfdir' to determine the ovn_etcdir
>> path.
>>
>> Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
> 
> Looks good to me, thanks!
> 
> Acked-by: Dumitru Ceara <dceara@redhat.com>

I pushed this to master.

> 
>> ---
>>   utilities/ovn-lib.in | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in
>> index 50111a76b..a8fc9d6db 100644
>> --- a/utilities/ovn-lib.in
>> +++ b/utilities/ovn-lib.in
>> @@ -25,7 +25,7 @@
>>   ovn_logdir=${OVN_LOGDIR-'@LOGDIR@'}                 # /var/log/ovn
>>   ovn_rundir=${OVN_RUNDIR-'@OVN_RUNDIR@'}                 # /var/run/ovn
>>   ovn_sysconfdir=${OVN_SYSCONFDIR-'@sysconfdir@'}     # /etc
>> -ovn_etcdir=$sysconfdir/ovn                          # /etc/ovn
>> +ovn_etcdir=$ovn_sysconfdir/ovn                      # /etc/ovn
>>   ovn_datadir=${OVN_PKGDATADIR-'@pkgdatadir@'}        # /usr/share/ovn
>>   ovn_bindir=${OVN_BINDIR-'@bindir@'}                 # /usr/bin
>>   ovn_sbindir=${OVN_SBINDIR-'@sbindir@'}              # /usr/sbin
>> --
>> 2.21.0
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>

Patch
diff mbox series

diff --git a/utilities/ovn-lib.in b/utilities/ovn-lib.in
index 50111a76b..a8fc9d6db 100644
--- a/utilities/ovn-lib.in
+++ b/utilities/ovn-lib.in
@@ -25,7 +25,7 @@ 
 ovn_logdir=${OVN_LOGDIR-'@LOGDIR@'}                 # /var/log/ovn
 ovn_rundir=${OVN_RUNDIR-'@OVN_RUNDIR@'}                 # /var/run/ovn
 ovn_sysconfdir=${OVN_SYSCONFDIR-'@sysconfdir@'}     # /etc
-ovn_etcdir=$sysconfdir/ovn                          # /etc/ovn
+ovn_etcdir=$ovn_sysconfdir/ovn                      # /etc/ovn
 ovn_datadir=${OVN_PKGDATADIR-'@pkgdatadir@'}        # /usr/share/ovn
 ovn_bindir=${OVN_BINDIR-'@bindir@'}                 # /usr/bin
 ovn_sbindir=${OVN_SBINDIR-'@sbindir@'}              # /usr/sbin