summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-09-11 15:41:47 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-09-11 15:41:47 -0700
commit97137382ec3694b478264ef4c5f8650da47a89ac (patch)
treefe75839176cacbce342f8f4b727a83bb7a96eabe
parent92552a6237a9c59fbc4ed6350a8b6c2bee8a2c73 (diff)
parentbc19150dee5789ca4500439594147caff85e5ddd (diff)
downloadvyatta-cfg-97137382ec3694b478264ef4c5f8650da47a89ac.tar.gz
vyatta-cfg-97137382ec3694b478264ef4c5f8650da47a89ac.zip
Merge branch 'kenwood' of suva.vyatta.com:/git/vyatta-cfg into kenwood
-rw-r--r--src/common/unionfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c
index 6d71402..8721651 100644
--- a/src/common/unionfs.c
+++ b/src/common/unionfs.c
@@ -1040,7 +1040,9 @@ dlist_test_func(GQuark key_id,gpointer data,gpointer user_data)
new_vn = vn;
// strcat(new_vn->_data._path,"/");
strcat(new_vn->_data._path,"/value:");
- strcat(new_vn->_data._path,(char*)g_quark_to_string(key_id));
+ if (vn_parent->_config._def.multi == FALSE) {
+ strcat(new_vn->_data._path,(char*)g_quark_to_string(key_id));
+ }
}
new_vn->_data._value = TRUE;
strcpy(new_vn->_data._name,(char*)g_quark_to_string(key_id));