diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:18:30 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 12:18:30 +0100 |
| commit | 1895cf2762e229ee8a59692420fa1717246a85d2 (patch) | |
| tree | 569340f0af6c20a445c1b60a3c03e659d3d3a7f8 | |
| parent | 25e5b7433b5b7c6d47a9ddf929937dc0b9c05a78 (diff) | |
| parent | 61d641154b78cfa0ee564ed91a49994b23acb081 (diff) | |
| download | vyatta-op-1895cf2762e229ee8a59692420fa1717246a85d2.tar.gz vyatta-op-1895cf2762e229ee8a59692420fa1717246a85d2.zip | |
Merge branch 'equuleus' of github.com:vyos/vyatta-op into current
* 'equuleus' of github.com:vyos/vyatta-op:
Jenkins: import Pipeline from vyos-1x commit bd00ec7
T1604: run bash builtin "set" as-is in _vyatta_op_run
update Jenkins file for equuleus
T1571: fix the grep expression in "run show log vpn *".
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | functions/interpreter/vyatta-op-run | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 20eb253..b11267e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,7 @@ pipeline { agent { docker { args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006' - image 'vyos/vyos-build:current' + image 'vyos/vyos-build:equuleus' } } options { diff --git a/functions/interpreter/vyatta-op-run b/functions/interpreter/vyatta-op-run index b0f72ae..ee4cb1c 100644 --- a/functions/interpreter/vyatta-op-run +++ b/functions/interpreter/vyatta-op-run @@ -155,6 +155,14 @@ _vyatta_op_conv_run_cmd () _vyatta_op_run () { + # if run with bash builtin "set -/+*" run set and return + # this happens when a different completion script runs eval "set ..." + # (VyOS T1604) + if [[ "$1" == "set" && "$2" =~ ^(-|\+).* ]]; then + set "${@:2}" + return + fi + local -i estat local tpath=$vyatta_op_templates local restore_shopts=$( shopt -p extglob nullglob | tr \\n \; ) |