diff options
| author | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:43:37 -0700 |
|---|---|---|
| committer | Mark O'Brien <mobrien@firebolt.vyatta.com> | 2008-07-09 13:43:37 -0700 |
| commit | 8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7 (patch) | |
| tree | eea1c778ce0b1e0cb192071ed697f0a68de252af /etc/bash_completion.d/20vyatta-cfg | |
| parent | 94c402a24ed5a5a3e9b6aeaabc47446efb1a7a37 (diff) | |
| parent | 42d6c942800e2273b77ea92371ffdcb3f183163f (diff) | |
| download | vyatta-cfg-8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7.tar.gz vyatta-cfg-8c1039fa5e8d8284f71923ee719d3bfa4f6a2fe7.zip | |
Merge branch 'hollywood' of git:/git/vyatta-cfg into hollywood
Diffstat (limited to 'etc/bash_completion.d/20vyatta-cfg')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index f1d100e..3b523bd 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -75,9 +75,10 @@ discard () changes=0 fi - sudo umount ${VYATTA_TEMP_CONFIG_DIR}; - sudo rm -fr ${VYATTA_CHANGES_ONLY_DIR}; - sudo mkdir -p ${VYATTA_CHANGES_ONLY_DIR}; + sudo umount $VYATTA_TEMP_CONFIG_DIR + sudo rm -fr $VYATTA_CHANGES_ONLY_DIR $VYATTA_TEMP_CONFIG_DIR + make_vyatta_config_dir $VYATTA_CHANGES_ONLY_DIR + make_vyatta_config_dir $VYATTA_TEMP_CONFIG_DIR sudo mount -t unionfs -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:${VYATTA_ACTIVE_CONFIGURATION_DIR}=ro unionfs ${VYATTA_TEMP_CONFIG_DIR}; if (( changes )); then @@ -813,22 +814,26 @@ vyatta_config_complete () if (( ${#COMP_WORDS[@]} < 2 )); then declare -a hitems=( "commit" \ + "copy" \ "delete" \ - "discard" \ + "discard" \ "edit" \ "exit" \ "load" \ + "rename" \ "run" \ "save" \ "set" \ "show" ) declare -a hstrs=( \ "Commit the current set of changes" \ + "Copy a configuration element" \ "Delete a configuration element" \ "Discard uncommitted changes" \ "Edit a sub-element" \ "Exit from this configuration level" \ "Load configuration from a file" \ + "Rename a configuration element" \ "Run an operational-mode command" \ "Save configuration to a file" \ "Set the value of a parameter or create a new element" \ |