From d8b30b85b208f5905be7c386d656d62afbfe627f Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@ancheng-vm.localdomain>
Date: Thu, 20 Sep 2007 18:31:08 -0700
Subject: minor fix and updated .gitignore.

---
 .gitignore            | 1 +
 etc/default/vyatta.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8578ae8..154ab6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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..3b0ffa2 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
-- 
cgit v1.2.3


From f37bb5cfaf96a2a71b0825e776a50438d67cf049 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@ancheng-vm.localdomain>
Date: Thu, 20 Sep 2007 18:53:29 -0700
Subject: fixed config env variables.

---
 etc/default/vyatta.in | 6 +++---
 1 file 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
-- 
cgit v1.2.3