VPP-958: RPM Update wipes out local changes to 80-vpp.conf

Changed the %config to %config(noreplace) for the two files in the
vpp.spec file that use it, 80-vpp.conf and startup.conf. Any local
changes to these files will now remain. If a newer version of the file
is published, the new version will be copied over as {filename}.rpmnew,
and the changes will not be applied without manual intervention.

Change-Id: I00b2c7abca20bc33f82479374dd184fc57a9abc5
Signed-off-by: Billy McFall <bmcfall@redhat.com>
This commit is contained in:
Billy McFall
2017-09-08 20:11:58 +00:00
committed by Dave Wallace
parent 50570ecef6
commit ce41a5c803

View File

@ -294,8 +294,8 @@ fi
/usr/bin/vpp* /usr/bin/vpp*
/usr/bin/svm* /usr/bin/svm*
/usr/bin/elftool /usr/bin/elftool
%config /etc/sysctl.d/80-vpp.conf %config(noreplace) /etc/sysctl.d/80-vpp.conf
%config /etc/vpp/startup.conf %config(noreplace) /etc/vpp/startup.conf
/usr/share/vpp/api/* /usr/share/vpp/api/*
%files lib %files lib