diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 08:24:04 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 08:24:04 -0700 |
| commit | fcd03ea4219a33771ac8d74d6f526228dd57caa1 (patch) | |
| tree | f99d967a6fa838ae97b10279809e95ad96fe71eb | |
| parent | 1af622ab0332f583c842cad1dd9ff9f9c5dcc42d (diff) | |
| parent | 84fb12226eaf723a833031e17dccc7a8980efeab (diff) | |
| download | vyatta-cfg-fcd03ea4219a33771ac8d74d6f526228dd57caa1.tar.gz vyatta-cfg-fcd03ea4219a33771ac8d74d6f526228dd57caa1.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg into jenner
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | src/common/unionfs.c | 8 |
2 files changed, 17 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 186f488..eabcbb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +vyatta-cfg (0.14.41) unstable; urgency=low + + [ slioch ] + * added action and location of error to syslog on commit. error + message string will need to be added later after some reworking of + the old node + + [ Stephen Hemminger ] + * Block shutdown in configure mode + + [ slioch ] + * buggy file exist test--thanx stig for test case to repro. fixes + vpn_smoke regression failure. + + -- slioch <slioch@eng-140.vyatta.com> Tue, 10 Mar 2009 21:31:05 -0700 + vyatta-cfg (0.14.40) unstable; urgency=low [ Stig Thormodsrud ] diff --git a/src/common/unionfs.c b/src/common/unionfs.c index 4e62b01..7c29ad1 100644 --- a/src/common/unionfs.c +++ b/src/common/unionfs.c @@ -242,7 +242,7 @@ retrieve_data(char* rel_data_path, GNode *node, char* root, NODE_OPERATION op) char buf[MAX_LENGTH_HELP_STR]; sprintf(buf,"%s/%s",get_adirp(),rel_data_path); struct stat s; - if ((lstat(buf,&s) != 0) && S_ISREG(s.st_mode)) { + if (lstat(buf,&s) != 0) { struct VyattaNode* vn = (struct VyattaNode*)node->data; vn->_data._operation = K_CREATE_OP; } @@ -559,12 +559,6 @@ common_commit_copy_to_live_config(GNode *node, boolean test_mode) sprintf(abuf_root,"%s",get_adirp()); //only operate on path if it exists - struct stat s; - if ((lstat(mbuf,&s) != 0) && S_ISREG(s.st_mode)) { - printf("common_commit_copy_to_live_config(): failed to find: %s, aborting copy\n",mbuf); - return; - } - //have to clean out tbuf before copying sprintf(command, formatpoint5, tbuf); if (g_debug) { |