diff options
| author |   Miroslav Miklus <mmiklus@cisco.com> | 2016-10-11 13:35:26 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-10-11 18:36:51 +0000 |
| commit | 8e08e74ce018f33ac0721fef729429b859d3bf0e (patch) | |
| tree | eb1fe2892e33a1e05441c59195c14ba071c4d464 | |
| parent | 383740d102769721f2da64c4d6666025b0543836 (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>
| -rw-r--r-- | build-data/platforms.mk | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.spec | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk index 59c28090..36cfc878 100644 --- 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 b585579e..5fd9629d 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 |