diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-06-21 21:56:49 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-06-21 21:56:49 +0000 |
| commit | acdd0569eb1e6c50e08bf9a3b8c3de57510c8535 (patch) | |
| tree | 2fd6161926bc5f52b903d4452bd1d722ef40741a /etc | |
| parent | d510ee758bdf20507f0b9dceb52e737a37452be7 (diff) | |
| parent | 4c0cb014d55882ed769a89d9d630bd1160d4ef54 (diff) | |
| download | vyatta-cfg-acdd0569eb1e6c50e08bf9a3b8c3de57510c8535.tar.gz vyatta-cfg-acdd0569eb1e6c50e08bf9a3b8c3de57510c8535.zip | |
Merge branch 'hollywood' of mohit@git.vyatta.com:/git/vyatta-cfg into hollywood
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 6 | ||||
| -rw-r--r-- | etc/shell/level/users/allowed-op | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index d501019..f1d100e 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -76,8 +76,8 @@ discard () fi sudo umount ${VYATTA_TEMP_CONFIG_DIR}; - rm -fr ${VYATTA_CHANGES_ONLY_DIR}; - mkdir -p ${VYATTA_CHANGES_ONLY_DIR}; + sudo rm -fr ${VYATTA_CHANGES_ONLY_DIR}; + sudo mkdir -p ${VYATTA_CHANGES_ONLY_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 @@ -814,6 +814,7 @@ vyatta_config_complete () if (( ${#COMP_WORDS[@]} < 2 )); then declare -a hitems=( "commit" \ "delete" \ + "discard" \ "edit" \ "exit" \ "load" \ @@ -824,6 +825,7 @@ vyatta_config_complete () declare -a hstrs=( \ "Commit the current set of changes" \ "Delete a configuration element" \ + "Discard uncommitted changes" \ "Edit a sub-element" \ "Exit from this configuration level" \ "Load configuration from a file" \ diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op index 337a5b2..9fc7fa0 100644 --- a/etc/shell/level/users/allowed-op +++ b/etc/shell/level/users/allowed-op @@ -1,4 +1,3 @@ -discard clear debug exit |