summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-03-18 16:54:15 -0700
committerrbalocca <rbalocca@vyatta.com>2008-03-18 16:54:15 -0700
commitdd612bb6e5b00f6d2926e89b9d7d97c37d40cf47 (patch)
tree90fd29e77d702bd0266b458247453e5dd59d6dcb /src
parent2c3eea0064d63ddc71abf40ec7f4284d0989895e (diff)
parentfb025a40a310668057b77eb03c1b3c60ddf77287 (diff)
downloadvyatta-cfg-dd612bb6e5b00f6d2926e89b9d7d97c37d40cf47.tar.gz
vyatta-cfg-dd612bb6e5b00f6d2926e89b9d7d97c37d40cf47.zip
Merge branch 'glendale' into hollywood
Diffstat (limited to 'src')
-rw-r--r--src/commit.c2
-rw-r--r--src/delete.c2
2 files changed, 2 insertions, 2 deletions
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);
diff --git a/src/delete.c b/src/delete.c
index b62a697..bb36fd1 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -28,7 +28,7 @@ static void remove_rf(boolean do_umount)
command = my_malloc(strlen(get_mdirp()) + strlen(get_cdirp()) +
strlen(get_mdirp()) + 100,
"delete");
- sprintf(command, "sudo mount -t $UNIONFS -o dirs=%s=rw:%s=ro:"
+ sprintf(command, "sudo mount -t $UNIONFS -o dirs=%s=rw:%s=ro"
" $UNIONFS %s", get_cdirp(), get_adirp(), get_mdirp());
system(command);
free(command);