diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-03-02 09:51:39 -0800 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-03-02 09:51:39 -0800 |
| commit | f99deef50eda86d063338c92ceed768b5578fb0b (patch) | |
| tree | 54b3cdcc30a82a5ddbade6e0476e7383843b5bbf | |
| parent | abe762f7d6b77bb11433e899fe38aab2d5cbe8c7 (diff) | |
| download | vyatta-cfg-f99deef50eda86d063338c92ceed768b5578fb0b.tar.gz vyatta-cfg-f99deef50eda86d063338c92ceed768b5578fb0b.zip | |
fixed preservation of def file when committing configuration. default leafs
configured by system will now be suppressed via show command (same behavior as
with old commit).
| -rw-r--r-- | src/common/unionfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 30da90e..0aaffe0 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -1019,7 +1019,7 @@ copy_func(GNode *node, gpointer data) struct SrcDst *sd = (struct SrcDst*)data; static const char format[]="mkdir -p %s%s";/*tmpp, adirp*/ - static const char format_value[]="cp %s%snode.val %s%s.";/*tmpp, adirp*/ + static const char format_value[]="cp %s%s{node.val,def} %s%s. 2>/dev/null";/*tmpp, adirp*/ char *path = ((struct VyattaNode*)(node->data))->_data._path; //might not work for terminating multinodes as the node.val won't be copied |