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>

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 59c2809..36cfc87 100644 (file)
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -52,7 +52,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : and sysctl config ;                                           \
-       echo ../../vpp/conf/80-vpp.conf /usr/lib/sysctl.d               \
+       echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d                   \
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : dev package needs a couple of additions ;                     \

diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index b585579..5fd9629 100644 (file)
--- 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