diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-25 10:16:55 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-25 10:16:55 -0800 |
| commit | 0d65f20bc1842f9e1d7335775a216bb86676dd30 (patch) | |
| tree | 328370f9c24637376240ee57b2a716bf85feca29 | |
| parent | abcab4879afa865b760e9444fcd59fdcac1c5085 (diff) | |
| parent | 5cdd12d03230ec8eed2fdd9d6ddba12e7286c3b9 (diff) | |
| download | vyatta-cfg-0d65f20bc1842f9e1d7335775a216bb86676dd30.tar.gz vyatta-cfg-0d65f20bc1842f9e1d7335775a216bb86676dd30.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/common/unionfs.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e14d6f4..58134a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg (0.14.24) unstable; urgency=low + + * nested priority case under interfaces need mkdir with -p option to + set + + -- slioch <slioch@eng-140.vyatta.com> Wed, 25 Feb 2009 10:06:21 -0800 + vyatta-cfg (0.14.23) unstable; urgency=low * replace unionfs synchronization code with piecewise copy. this diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 7cdb03c..760fd19 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -274,7 +274,7 @@ retrieve_data(char* rel_data_path, GNode *node, char* root, NODE_OPERATION op) strcmp(dirp->d_name, VALUE_FILE) != 0) { processed = TRUE; char *data_buf = malloc(MAX_LENGTH_DIR_PATH*sizeof(char)); - if (strncmp(dirp->d_name,DELETED_NODE,4) == 0) { + if (strncmp(dirp->d_name,DELETED_NODE,4) == 0) { strcpy(data_buf,dirp->d_name+4); //SKIP THE .WH. //create new node and insert... @@ -1121,7 +1121,7 @@ copy_func(GNode *node, gpointer data) char *command = malloc(MAX_LENGTH_DIR_PATH); struct SrcDst *sd = (struct SrcDst*)data; - static const char format[]="mkdir %s%s";/*tmpp, adirp*/ + static const char format[]="mkdir -p %s%s";/*tmpp, adirp*/ static const char format_value[]="cp %s%snode.val %s%s.";/*tmpp, adirp*/ char *path = ((struct VyattaNode*)(node->data))->_data._path; |