summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/default/vyatta-cfg2
-rwxr-xr-xscripts/vyatta-cfg-cmd-wrapper2
-rw-r--r--src/commit.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg
index 7d189d8..b07440f 100644
--- a/etc/default/vyatta-cfg
+++ b/etc/default/vyatta-cfg
@@ -3,7 +3,7 @@
{
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_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
diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper
index a1a573e..518147d 100755
--- a/scripts/vyatta-cfg-cmd-wrapper
+++ b/scripts/vyatta-cfg-cmd-wrapper
@@ -32,7 +32,7 @@ export VYATTA_EDIT_LEVEL=/;
export VYATTA_TEMPLATE_LEVEL=/;
export VYATTA_ACTIVE_CONFIGURATION_DIR=/opt/vyatta/config/active;
-export VYATTA_CHANGES_ONLY_DIR=/opt/vyatta/config/tmp/changes_only_$PPID;
+export VYATTA_CHANGES_ONLY_DIR=/tmp/changes_only_$PPID;
export VYATTA_TEMP_CONFIG_DIR=/opt/vyatta/config/tmp/new_config_$PPID;
export VYATTA_CONFIG_TMP=/opt/vyatta/config/tmp/tmp_$PPID;
diff --git a/src/commit.c b/src/commit.c
index c3219e5..980a98b 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -1359,7 +1359,7 @@ static int fin_commit(boolean ok)
system(command);
my_free(command);
- command = my_malloc(strlen(format3) + c_len, "");
+ command = my_malloc(strlen(format3) + t_len, "");
sprintf(command, format3, get_tmpp());
system(command);
my_free(command);