1
0
Fork 0

profiles: reversed SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"

This commit reversed it to read:
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
The idea is to go from implicit to explicit, i.e. from defaults
to overrides in sysctl.d subdirectory. This behavior is
expected in RHEL-6.

But many distributions use the reverse approach (state before
this commit). The idea is that /etc/sysctl.d/* hosts default
settings provided by individual packages which can be overriden
by "master" /etc/sysctl.conf.

In Fedora (F20 checked) it is implemented by the following
symlink:
/etc/sysctl.d/99-sysctl.conf -> ../sysctl.conf

So it is also effectively reversed in comparison to RHEL-6.

As tuned-0.x is supported only in RHEL-6, we need to follow
RHEL-6 behaviour in tuned-1.0 branch. This change doesn't
affect tuned-2.x.

resolves: rhbz#1036049

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2015-02-09 14:22:21 +01:00
parent 25e7cacc89
commit e2b78c65e5
18 changed files with 19 additions and 19 deletions

View file

@ -48,8 +48,8 @@ service is enabled and started, it will use the configuration options from
SYSCTL="/etc/sysctl.ktune"
USE_KTUNE_D="yes"
SYSCTL_PRE="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_PRE="/etc/sysctl.conf /etc/sysctl.d/*"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
ELEVATOR="deadline"
ELEVATOR_TUNE_DEVS="/sys/block/{sd,cciss}*/queue/scheduler"

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/syctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/syctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -16,7 +16,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -17,7 +17,7 @@ SYSCTL_PRE="/etc/sysctl.d/* /etc/sysctl.conf"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them
#SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
#SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,5 +13,5 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler

View file

@ -13,7 +13,7 @@ USE_KTUNE_D="yes"
# This is the custom sysctl configuration file. Any settings in this file will
# be applied after the ktune settings, overriding them. Comment this out to
# use only the ktune settings.
SYSCTL_POST="/etc/sysctl.d/* /etc/sysctl.conf"
SYSCTL_POST="/etc/sysctl.conf /etc/sysctl.d/*"
# This is the I/O scheduler ktune will use. This will *not* override anything
# explicitly set on the kernel command line, nor will it change the scheduler