mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-05-29 19:11:44 +00:00
Merge pull request #6134 from taspelund/unlink_warning
vtysh: don't warn when saving conf the first time
This commit is contained in:
commit
9247ee0f04
@ -2877,13 +2877,12 @@ static void backup_config_file(const char *fbackup)
|
|||||||
strlcat(integrate_sav, CONF_BACKUP_EXT, integrate_sav_sz);
|
strlcat(integrate_sav, CONF_BACKUP_EXT, integrate_sav_sz);
|
||||||
|
|
||||||
/* Move current configuration file to backup config file. */
|
/* Move current configuration file to backup config file. */
|
||||||
if (unlink(integrate_sav) != 0) {
|
if (unlink(integrate_sav) != 0 && errno != ENOENT)
|
||||||
vty_out(vty, "Warning: %s unlink failed\n", integrate_sav);
|
vty_out(vty, "Unlink failed for %s: %s\n", integrate_sav,
|
||||||
}
|
strerror(errno));
|
||||||
if (rename(fbackup, integrate_sav) != 0) {
|
if (rename(fbackup, integrate_sav) != 0 && errno != ENOENT)
|
||||||
vty_out(vty, "Error renaming %s to %s\n", fbackup,
|
vty_out(vty, "Error renaming %s to %s: %s\n", fbackup,
|
||||||
integrate_sav);
|
integrate_sav, strerror(errno));
|
||||||
}
|
|
||||||
free(integrate_sav);
|
free(integrate_sav);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user