From Tal Nisan <tnisan@redhat.com>:

Tal Nisan has submitted this change and it was merged. Change subject: packaging: engine-backup: Do not restore packaged pki files ...................................................................... packaging: engine-backup: Do not restore packaged pki files We recently added to cert.template.in stuff to allow adding SubjectAltName. If engine-backup --mode=restore restores a previous version's file, engine-setup will fail. While doing that, add two other files that are packaged and should not be restored. Bug-Url: https://bugzilla.redhat.com/1452182 Change-Id: I1fb21e85a4d2b7f0c85807702ecbb72cbe7a6238 Signed-off-by: Yedidyah Bar David <didi@redhat.com> --- M packaging/bin/engine-backup.sh.in 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Sandro Bonazzola: Looks good to me, approved Jenkins CI: Passed CI tests Yedidyah Bar David: Verified -- To view, visit https://gerrit.ovirt.org/76983 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fb21e85a4d2b7f0c85807702ecbb72cbe7a6238 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-4.1 Gerrit-Owner: Yedidyah Bar David <didi@redhat.com> Gerrit-Reviewer: Ido Rosenzwig <irosenzw@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Lev Veyde <lveyde@redhat.com> Gerrit-Reviewer: Rafael Martins <rafael@rafaelmartins.eng.br> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo@redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>