diff options
| author | Michael Larson <slioch@eng-140.vyatta.com> | 2008-06-25 11:53:19 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@eng-140.vyatta.com> | 2008-06-25 11:53:19 -0700 |
| commit | 4c0cb014d55882ed769a89d9d630bd1160d4ef54 (patch) | |
| tree | 8dc32ed4137094f708f68298e8a6f0ae0f435ad3 /etc | |
| parent | 508087a450210fb6bfb4489f118c82f9515f61f5 (diff) | |
| download | vyatta-cfg-4c0cb014d55882ed769a89d9d630bd1160d4ef54.tar.gz vyatta-cfg-4c0cb014d55882ed769a89d9d630bd1160d4ef54.zip | |
fixed non-root user access for discard. also moved help string.
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 5b997da..724c235 100644 --- a/etc/shell/level/users/allowed-op +++ b/etc/shell/level/users/allowed-op @@ -1,4 +1,3 @@ -discard clear debug exit |