diff options
| author | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:44:09 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:44:09 -0700 |
| commit | 12389b69ceff66a1642d28f904c1685b7421f719 (patch) | |
| tree | a746e4f16180eac5644ffedef5bb610161f8d285 /etc/bash_completion.d/10vyatta-op | |
| parent | 90567d603a6c9867b6b9cb93f185a46b88f5aef9 (diff) | |
| parent | 06acbf6c67ae127378c14b646de3f66efca57a1c (diff) | |
| download | vyatta-op-12389b69ceff66a1642d28f904c1685b7421f719.tar.gz vyatta-op-12389b69ceff66a1642d28f904c1685b7421f719.zip | |
Merge branch 'hollywood' of git:/git/vyatta-op into hollywood
Diffstat (limited to 'etc/bash_completion.d/10vyatta-op')
| -rw-r--r-- | etc/bash_completion.d/10vyatta-op | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op index fe3163c..4735462 100644 --- a/etc/bash_completion.d/10vyatta-op +++ b/etc/bash_completion.d/10vyatta-op @@ -434,11 +434,6 @@ fi alias vtysh=$_vyatta_vtysh -# don't initialize if we are in configure mode -if [ "$_OFR_CONFIGURE" == "ok" ]; then - return 0 -fi - nullglob_save=$( shopt -p nullglob ) shopt -s nullglob for f in ${vyatta_datadir}/vyatta-op/functions/allowed/* ; do @@ -447,6 +442,11 @@ done eval $nullglob_save unset nullglob_save +# don't initialize if we are in configure mode +if [ "$_OFR_CONFIGURE" == "ok" ]; then + return 0 +fi + _vyatta_op_init $@ ### Local Variables: |