diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2007-09-20 19:06:23 -0700 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2007-09-20 19:06:23 -0700 |
| commit | a470e6d1f48b41e03a9b7f7702dbfd9f439c354a (patch) | |
| tree | 5dcd1a4d120dc3930f19a7a8cf7c70e2eeb1391c | |
| parent | a5b2f72e51608a7a903dbfc02e858d0056948c6b (diff) | |
| parent | f37bb5cfaf96a2a71b0825e776a50438d67cf049 (diff) | |
| download | vyatta-op-a470e6d1f48b41e03a9b7f7702dbfd9f439c354a.tar.gz vyatta-op-a470e6d1f48b41e03a9b7f7702dbfd9f439c354a.zip | |
Merge branch 'master' of phuket:/usr/local/git/vyatta-op
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | etc/default/vyatta.in | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,5 @@ *~ +.*.swp /aclocal.m4 /autom4te.cache /build-stamp diff --git a/etc/default/vyatta.in b/etc/default/vyatta.in index d3191fd..f323815 100644 --- a/etc/default/vyatta.in +++ b/etc/default/vyatta.in @@ -27,7 +27,7 @@ unset _vyatta_extglob if test -n "@prefix@" ; then declare -x -r vyatta_prefix=@prefix@ else - declare -x -r vyatta_prefix=$vyatta_prefix + declare -x -r vyatta_prefix=/opt/vyatta fi fi if test -z "$vyatta_exec_prefix" ; then @@ -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 |