diff options
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 6 | ||||
| -rw-r--r-- | etc/default/vyatta-cfg | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index 3b523bd..0233e99 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # **** License **** # This program is free software; you can redistribute it and/or modify @@ -79,7 +79,9 @@ discard () 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}; + sudo mount -t $UNIONFS \ + -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:${VYATTA_ACTIVE_CONFIGURATION_DIR}=ro \ + $UNIONFS ${VYATTA_TEMP_CONFIG_DIR} if (( changes )); then echo "Changes have been discarded" diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index b07440f..8dbf00e 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -10,6 +10,7 @@ declare -x -r VYATTA_CONFIG_TEMPLATE=$vyatta_cfg_templates declare -x -r VYATTA_TAG_NAME=node.tag declare -x -r VYATTA_MOD_NAME=.modified declare -x -r VYATTA_CFG_GROUP_NAME=vyattacfg +declare -x -r HISTIGNORE="*password*:*-secret*" } 2>/dev/null || : declare -x VYATTA_EDIT_LEVEL=/ |