summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@ancheng-vm.localdomain>2007-09-20 18:53:29 -0700
committerAn-Cheng Huang <ancheng@ancheng-vm.localdomain>2007-09-20 18:53:29 -0700
commitf37bb5cfaf96a2a71b0825e776a50438d67cf049 (patch)
tree0e7130794ff0ebf431580e86ed3dbc4735d3cb99
parentd8b30b85b208f5905be7c386d656d62afbfe627f (diff)
downloadvyatta-op-f37bb5cfaf96a2a71b0825e776a50438d67cf049.tar.gz
vyatta-op-f37bb5cfaf96a2a71b0825e776a50438d67cf049.zip
fixed config env variables.
-rw-r--r--etc/default/vyatta.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/default/vyatta.in b/etc/default/vyatta.in
index 3b0ffa2..f323815 100644
--- a/etc/default/vyatta.in
+++ b/etc/default/vyatta.in
@@ -132,8 +132,8 @@ unset _vyatta_extglob
if test -z "$vyatta_op_templates" ; then
declare -x -r vyatta_op_templates=$vyatta_datadir/vyatta-op/templates
fi
- if test -z "$vyatta_config_templates" ; then
- declare -x -r vyatta_config_templates=$vyatta_datadir/vyatta-config/templates
+ if test -z "$vyatta_cfg_templates" ; then
+ declare -x -r vyatta_cfg_templates=$vyatta_datadir/ofr/template
fi
if test -z "$vyatta_configdir" ; then
declare -x -r vyatta_configdir=$vyatta_prefix/config
@@ -150,7 +150,7 @@ 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_config_templatesdir
+export VYATTA_CONFIG_TEMPLATE=$vyatta_cfg_templates
export VYATTA_EDIT_LEVEL=/
export VYATTA_TEMPLATE_LEVEL=/
export VYATTA_TAG_NAME=node.tag