diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-08-18 13:33:43 -0700 |
| commit | 14df7aa3c937ed8907bd7e9b2657526233691803 (patch) | |
| tree | 77e876ba2739e7fe396e93b8fd908df845d60d51 /etc/default | |
| parent | abc2986d38f4b6f7a7ccc0fd3fb10e4f21652209 (diff) | |
| parent | 3594ffa9f1c62d5f73d12b35f81a862c762b5d44 (diff) | |
| download | vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.tar.gz vyatta-cfg-14df7aa3c937ed8907bd7e9b2657526233691803.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to 'etc/default')
| -rw-r--r-- | etc/default/vyatta-cfg | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index 8dbf00e..bc7854a 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -1,21 +1,14 @@ # Vyatta shell environment variables for config mode # should be sourced from /etc/default/vyatta +# note that session environment is now handled separately. +# (see /etc/bash_completion.d/20vyatta-cfg) + { -declare -x -r VYATTA_ACTIVE_CONFIGURATION_DIR=${vyatta_configdir}/active -declare -x -r VYATTA_CHANGES_ONLY_DIR=/tmp/changes_only_$$ -declare -x -r VYATTA_TEMP_CONFIG_DIR=${vyatta_configdir}/tmp/new_config_$$ -declare -x -r VYATTA_CONFIG_TMP=${vyatta_configdir}/tmp/tmp_$$ -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=/ -declare -x VYATTA_TEMPLATE_LEVEL=/ - # don't set level if already set if [ -n "$VYATTA_USER_LEVEL_DIR" ]; then return |