Merge pull request #6134 from taspelund/unlink_warning

vtysh: don't warn when saving conf the first time
This commit is contained in:
Donatas Abraitis 2020-04-05 18:52:08 +03:00 committed by GitHub
commit 9247ee0f04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2877,13 +2877,12 @@ static void backup_config_file(const char *fbackup)
strlcat(integrate_sav, CONF_BACKUP_EXT, integrate_sav_sz);
/* Move current configuration file to backup config file. */
if (unlink(integrate_sav) != 0) {
vty_out(vty, "Warning: %s unlink failed\n", integrate_sav);
}
if (rename(fbackup, integrate_sav) != 0) {
vty_out(vty, "Error renaming %s to %s\n", fbackup,
integrate_sav);
}
if (unlink(integrate_sav) != 0 && errno != ENOENT)
vty_out(vty, "Unlink failed for %s: %s\n", integrate_sav,
strerror(errno));
if (rename(fbackup, integrate_sav) != 0 && errno != ENOENT)
vty_out(vty, "Error renaming %s to %s: %s\n", fbackup,
integrate_sav, strerror(errno));
free(integrate_sav);
}