diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 18:58:51 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 18:58:51 +0100 |
| commit | 50186e6d7f33b4cc5300eba6b9381e2a2528d8b4 (patch) | |
| tree | 05032cedbe5a2beb67dd10c0493cff400b936bc1 /op-mode-definitions | |
| parent | ba8af69a619362d28ffcd45b6f0f042b743f38f4 (diff) | |
| parent | 2b8d48bcd77134dff741158c81f7fadf3183e280 (diff) | |
| download | vyos-1x-50186e6d7f33b4cc5300eba6b9381e2a2528d8b4.tar.gz vyos-1x-50186e6d7f33b4cc5300eba6b9381e2a2528d8b4.zip | |
Merge branch 'current' into crux
Diffstat (limited to 'op-mode-definitions')
| -rw-r--r-- | op-mode-definitions/show-bridge.xml | 6 | ||||
| -rw-r--r-- | op-mode-definitions/traffic-dump.xml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml index a3241951a..b285e2288 100644 --- a/op-mode-definitions/show-bridge.xml +++ b/op-mode-definitions/show-bridge.xml @@ -15,19 +15,19 @@ <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script> </completionHelp> </properties> - <command>/sbin/brctl show '$3'</command> + <command>/sbin/brctl show $3</command> <children> <leafNode name="macs"> <properties> <help>Show bridge Media Access Control (MAC) address table</help> </properties> - <command>/sbin/brctl showmacs '$3'</command> + <command>/sbin/brctl showmacs $3</command> </leafNode> <leafNode name="spanning-tree"> <properties> <help>Show bridge spanning tree information</help> </properties> - <command>/sbin/brctl showstp '$3'</command> + <command>/sbin/brctl showstp $3</command> </leafNode> </children> </tagNode> diff --git a/op-mode-definitions/traffic-dump.xml b/op-mode-definitions/traffic-dump.xml index 00a809a7c..6d86f7423 100644 --- a/op-mode-definitions/traffic-dump.xml +++ b/op-mode-definitions/traffic-dump.xml @@ -17,7 +17,7 @@ </properties> <children> <tagNode name="filter"> - <command>sudo tcpdump -n -i $4 $6</command> + <command>sudo tcpdump -n -i $4 "${@:6}"</command> <properties> <help>Monitor traffic matching filter conditions</help> </properties> @@ -29,7 +29,7 @@ </properties> <children> <tagNode name="filter"> - <command>sudo tcpdump -n -i $4 -w $6 $8</command> + <command>sudo tcpdump -n -i $4 -w $6 "${@:8}"</command> <properties> <help>Save a dump of traffic matching filter conditions to a file</help> </properties> |