summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorBilly McFall <bmcfall@redhat.com>2017-09-08 20:11:58 +0000
committerDave Wallace <dwallacelf@gmail.com>2017-09-15 13:57:51 +0000
commitce41a5c8032ff581a56b990361a2368c879a7adf (patch)
tree08faa630d8ec3add0d8508f0018c642582d000e5 /extras
parent50570ecef6d37b0c9d8c002f6dadb4ed0e138aa3 (diff)
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>
Diffstat (limited to 'extras')
-rw-r--r--extras/rpm/vpp.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 6c14b039b3f..86c0dbc9b6d 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -294,8 +294,8 @@ fi
/usr/bin/vpp*
/usr/bin/svm*
/usr/bin/elftool
-%config /etc/sysctl.d/80-vpp.conf
-%config /etc/vpp/startup.conf
+%config(noreplace) /etc/sysctl.d/80-vpp.conf
+%config(noreplace) /etc/vpp/startup.conf
/usr/share/vpp/api/*
%files lib