aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiroslav Miklus <mmiklus@cisco.com>2016-09-27 13:23:09 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2016-09-27 18:15:42 +0000
commit822af5c95d080a58cda504228df4b5f3896e72b6 (patch)
tree8e3aaa71f42dee42f7ade4d8c8ae31016d7524c4
parent3fa0af596056ae6e87692325c7ebe51636635313 (diff)
FIX sysctl configuration directory
man sysctl.d: ... Packages should install their configuration files in /usr/lib/. Files in /etc/ are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages. All configuration files are sorted by their filename in lexicographic order, regardless of which of the directories they reside in. If multiple files specify the same option, the entry in the file with the lexicographically latest name will take precedence. It is recommended to prefix all filenames with a two-digit number and a dash, to simplify the ordering of the files. If the administrator wants to disable a configuration file supplied by the vendor, the recommended way is to place a symlink to /dev/null in the configuration directory in /etc/, with the same filename as the vendor configuration file. ... Change-Id: I24b8b7fddf64ec287282ae195e07c9592c494ebe Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>
-rw-r--r--build-data/platforms.mk2
-rw-r--r--build-root/rpm/vpp.spec6
2 files changed, 4 insertions, 4 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 36cfc878b37..59c28090281 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 /etc/sysctl.d \
+ echo ../../vpp/conf/80-vpp.conf /usr/lib/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 35964b6df63..495901454cb 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -92,10 +92,10 @@ install -p -m 755 ../../vppapigen/pyvppapigen.py %{buildroot}%{_bindir}
# configs
#
mkdir -p -m755 %{buildroot}/etc/vpp
-mkdir -p -m755 %{buildroot}/etc/sysctl.d
+mkdir -p -m755 %{buildroot}/usr/lib/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}/etc/sysctl.d
+install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/usr/lib/sysctl.d
#
# libraries
#
@@ -180,7 +180,7 @@ sysctl --system
/usr/bin/vpp*
/usr/bin/svm*
/usr/bin/elftool
-%config /etc/sysctl.d/80-vpp.conf
+%config /usr/lib/sysctl.d/80-vpp.conf
%config /etc/vpp/startup.conf
%files lib