aboutsummaryrefslogtreecommitdiffstats
path: root/build-root
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-10-11 13:35:26 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2016-10-11 18:36:51 +0000
commit8e08e74ce018f33ac0721fef729429b859d3bf0e (patch)
treeeb1fe2892e33a1e05441c59195c14ba071c4d464 /build-root
parent383740d102769721f2da64c4d6666025b0543836 (diff)
VPP-474 Revert "FIX sysctl configuration directory"
This reverts commit 822af5c95d080a58cda504228df4b5f3896e72b6. Reason for revert is a bug in procps upstart script. Change-Id: Ie9e501c9b52e65d8d0f31ce6600823021e89fb6f Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
Diffstat (limited to 'build-root')
-rw-r--r--build-root/rpm/vpp.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index b585579ed1e..5fd9629dff9 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -95,10 +95,10 @@ install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
# configs
#
mkdir -p -m755 %{buildroot}/etc/vpp
-mkdir -p -m755 %{buildroot}/usr/lib/sysctl.d
+mkdir -p -m755 %{buildroot}/etc/sysctl.d
install -p -m 644 vpp.service %{buildroot}%{_unitdir}
install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
-install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/usr/lib/sysctl.d
+install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
#
# libraries
#
@@ -204,7 +204,7 @@ fi
/usr/bin/vpp*
/usr/bin/svm*
/usr/bin/elftool
-%config /usr/lib/sysctl.d/80-vpp.conf
+%config /etc/sysctl.d/80-vpp.conf
%config /etc/vpp/startup.conf
%files lib