summaryrefslogtreecommitdiff
path: root/etc/default/vyatta-cfg
diff options
context:
space:
mode:
authorrbalocca <rbalocca@fugazi.vyatta.com>2007-12-18 14:18:24 -0800
committerrbalocca <rbalocca@fugazi.vyatta.com>2007-12-18 14:18:24 -0800
commit64a8cfa9effac219e51498c3b8ef43437ad0396a (patch)
treefb11fa4d01b3dbe1f0f60e838b4ec450cbf31a64 /etc/default/vyatta-cfg
parent65db98116efa3c311c798f05f4f6ec97e9b6d643 (diff)
parent7966b8cf00e08548447e551a3fcfde40aa06cc59 (diff)
downloadvyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.tar.gz
vyatta-cfg-64a8cfa9effac219e51498c3b8ef43437ad0396a.zip
Merge branch 'master' into glendale
Diffstat (limited to 'etc/default/vyatta-cfg')
-rw-r--r--etc/default/vyatta-cfg21
1 files changed, 12 insertions, 9 deletions
diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg
index d369e0f..e560788 100644
--- a/etc/default/vyatta-cfg
+++ b/etc/default/vyatta-cfg
@@ -1,15 +1,18 @@
# Vyatta shell environment variables for config mode
# should be sourced from /etc/default/vyatta
-export VYATTA_ACTIVE_CONFIGURATION_DIR=${vyatta_configdir}/active
-export VYATTA_CHANGES_ONLY_DIR=${vyatta_configdir}/tmp/changes_only_$$
-export VYATTA_TEMP_CONFIG_DIR=${vyatta_configdir}/tmp/new_config_$$
-export VYATTA_CONFIG_TMP=${vyatta_configdir}/tmp/tmp_$$
-export VYATTA_CONFIG_TEMPLATE=$vyatta_cfg_templates
-export VYATTA_EDIT_LEVEL=/
-export VYATTA_TEMPLATE_LEVEL=/
-export VYATTA_TAG_NAME=node.tag
-export VYATTA_MOD_NAME=.modified
+{
+declare -x -r VYATTA_ACTIVE_CONFIGURATION_DIR=${vyatta_configdir}/active
+declare -x -r VYATTA_CHANGES_ONLY_DIR=${vyatta_configdir}/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_EDIT_LEVEL=/
+declare -x -r VYATTA_TEMPLATE_LEVEL=/
+declare -x -r VYATTA_TAG_NAME=node.tag
+declare -x -r VYATTA_MOD_NAME=.modified
+declare -x -r VYATTA_CFG_GROUP_NAME=vyattacfg
+} 2>/dev/null || :
# don't set level if already set
if [ -n "$VYATTA_USER_LEVEL_DIR" ]; then