| Message ID | 20220620200807.646927-1-mkp@redhat.com |
|---|---|
| State | Accepted |
| Commit | 8c1c447a1d25bfe652d6abefd25d9b70cf44f949 |
| Headers | show |
| Series | [ovs-dev,v2] ovs-tcpdump: Default to OVS_RUNDIR if present. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/intel-ovs-compilation | success | test: success |
On 6/20/22 22:08, Mike Pattrick wrote: > Now ovs-tcpdump will check for an OVS_RUNDIR environment variable and > if present, use it instead of the default RUNDIR. This is useful when > used in conjunction with OVS_PAUSE_TEST while running the test suite. > > Signed-off-by: Mike Pattrick <mkp@redhat.com> > > -- > V2: Removed unnecessary conditional > > Signed-off-by: Mike Pattrick <mkp@redhat.com> > --- > utilities/ovs-tcpdump.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in > index b3dc65440..7fd26e405 100755 > --- a/utilities/ovs-tcpdump.in > +++ b/utilities/ovs-tcpdump.in > @@ -406,7 +406,8 @@ def py_which(executable): > > > def main(): > - db_sock = 'unix:@RUNDIR@/db.sock' > + rundir = os.environ.get('OVS_RUNDIR', '@RUNDIR@') > + db_sock = 'unix:%s' % os.path.join(rundir, "db.sock") > interface = None > tcpdargs = [] > Thanks! Applied to master and branch-2.17. Best regards, Ilya Maximets.
diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in index b3dc65440..7fd26e405 100755 --- a/utilities/ovs-tcpdump.in +++ b/utilities/ovs-tcpdump.in @@ -406,7 +406,8 @@ def py_which(executable): def main(): - db_sock = 'unix:@RUNDIR@/db.sock' + rundir = os.environ.get('OVS_RUNDIR', '@RUNDIR@') + db_sock = 'unix:%s' % os.path.join(rundir, "db.sock") interface = None tcpdargs = []