diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-02-25 11:08:19 -0800 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-02-25 11:08:19 -0800 |
| commit | 1eef25550d68988d5299685ff6015c07d70a7e6e (patch) | |
| tree | e619915257b1372e81903de190478f62c2c527c2 | |
| parent | d40c4e1765835dfc6509d10b15e39dbb6c5ec9b9 (diff) | |
| download | vyatta-cfg-1eef25550d68988d5299685ff6015c07d70a7e6e.tar.gz vyatta-cfg-1eef25550d68988d5299685ff6015c07d70a7e6e.zip | |
cosmetic changes, and better to not leave interfaces root node under default priority.
| -rw-r--r-- | src/common/unionfs.c | 4 | ||||
| -rw-r--r-- | templates/priority | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/unionfs.c b/src/common/unionfs.c index e90b8d8..1a5af0c 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -1063,8 +1063,8 @@ delete_func(GNode *node, gpointer data) char *command = malloc(MAX_LENGTH_DIR_PATH); struct SrcDst *sd = (struct SrcDst*)data; - static const char format[]="rm -fv %s%s{*,.*} >&/dev/null;rmdir %s%s >&/dev/null ; /bin/true"; //need to remove opaque file. - static const char format_force_delete[]="rm -fv %s%s{*,.*} >&/dev/null;rm -fr %s%s >&/dev/null ; /bin/true"; //force delete as this is a delete operation with dependency + static const char format[]="rm -f %s%s{*,.*} >&/dev/null;rmdir %s%s >&/dev/null ; /bin/true"; //need to remove opaque file. + static const char format_force_delete[]="rm -f %s%s{*,.*} >&/dev/null;rm -fr %s%s >&/dev/null ; /bin/true"; //force delete as this is a delete operation with dependency static const char delete_format[]="rm %s%s../.wh.%s >&/dev/null"; char *path = ((struct VyattaNode*)(node->data))->_data._path; diff --git a/templates/priority b/templates/priority index 2b69d26..452d9bf 100644 --- a/templates/priority +++ b/templates/priority @@ -63,6 +63,7 @@ 650 protocols/ripng/timers 700 vpn 800 interfaces/ethernet/node.tag/vif/node.tag/vrrp +900 interfaces 900 protocols/snmp 900 cluster 900 qos-policy |