summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMichael Larson <slioch@eng-140.vyatta.com>2008-06-30 11:28:55 -0700
committerMichael Larson <slioch@eng-140.vyatta.com>2008-06-30 11:28:55 -0700
commite6e7dc57dc71495c40ee6937bff703c2c4a7f3ed (patch)
tree1b280207de8f0fd9f6344eddc8d970610c96518e /etc
parentb5b1c71bc95bdaea24f45e5738e9a3a7f8740a4f (diff)
downloadvyatta-cfg-e6e7dc57dc71495c40ee6937bff703c2c4a7f3ed.tar.gz
vyatta-cfg-e6e7dc57dc71495c40ee6937bff703c2c4a7f3ed.zip
fix for bug 3400. user vyatta needed modification to discard command.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/bash_completion.d/20vyatta-cfg7
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index f1d100e..a034937 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