diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-07 15:20:06 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-07 15:20:06 -0700 |
| commit | 8497bf5a76f8753710e1ae826a8b5e2ccbe46426 (patch) | |
| tree | 911f04a35d18a27717c844fa4387deb10d3b2ac6 /etc | |
| parent | 77caec4a1e442aa3bfc393c7347281364ce13dc9 (diff) | |
| parent | 4a9dadf356a83ee0270d3848c506d1ca969d2565 (diff) | |
| download | vyatta-op-8497bf5a76f8753710e1ae826a8b5e2ccbe46426.tar.gz vyatta-op-8497bf5a76f8753710e1ae826a8b5e2ccbe46426.zip | |
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-op into hollywood
Diffstat (limited to 'etc')
| -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: |