diff options
author | Justin Pettit <jpettit@nicira.com> | 2011-09-23 15:30:55 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2011-09-23 15:41:06 -0700 |
commit | cdc5f488517d7f012df6ff01e70a58af3db332a6 (patch) | |
tree | edbefcc668ef1d3bf97d7c8cfd13ecc596687ab2 | |
parent | 17411ecf2b4d02cfced5f69e567c17673d7d4462 (diff) |
ovs-bugtool: Use RUNDIR macro for ovs-appctl target.
Correct the target path used by ovs-appctl. The previous value was
hard-coded to "/var/run", but the common path is actually
"/var/run/openvswitch". However, it's better to use RUNDIR, since the
default location is build-time configurable.
-rwxr-xr-x | utilities/bugtool/ovs-bugtool.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index c2b603f2..422b2dd4 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -599,7 +599,7 @@ exclude those logs from the archive. vspidfile.close() for b in bond_list(vspid): cmd_output(CAP_NETWORK_STATUS, - [OVS_APPCTL, '-t', '/var/run/ovs-vswitchd.%s.ctl' % vspid, '-e' 'bond/show %s' % b], + [OVS_APPCTL, '-t', '@RUNDIR@/ovs-vswitchd.%s.ctl' % vspid, '-e' 'bond/show %s' % b], 'ovs-appctl-bond-show-%s.out' % b) except e: pass @@ -778,7 +778,7 @@ def dp_list(): def bond_list(pid): output = StringIO.StringIO() - procs = [ProcOutput([OVS_APPCTL, '-t', '/var/run/ovs-vswitchd.%s.ctl' % pid, '-e' 'bond/list'], caps[CAP_NETWORK_STATUS][MAX_TIME], output)] + procs = [ProcOutput([OVS_APPCTL, '-t', '@RUNDIR@/ovs-vswitchd.%s.ctl' % pid, '-e' 'bond/list'], caps[CAP_NETWORK_STATUS][MAX_TIME], output)] run_procs([procs]) |