Allow files in sysctl.d to override sysctl.conf
reported-by: Peter Gantner (a.k.a. nephros) <gentoo@nephros.org> X-Gentoo-Bug: 406631 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=406631
This commit is contained in:
parent
8104618d10
commit
09327f429f
@ -13,7 +13,7 @@ start()
|
||||
local retval=0 var= comments= conf=
|
||||
ebegin "Configuring kernel parameters"
|
||||
eindent
|
||||
for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
|
||||
for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
|
||||
if [ -r "$conf" ]; then
|
||||
vebegin "applying $conf"
|
||||
while read var comments; do
|
||||
|
@ -15,7 +15,7 @@ start()
|
||||
ebegin "Configuring kernel parameters"
|
||||
eindent
|
||||
|
||||
for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
|
||||
for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do
|
||||
if [ -r "$conf" ]; then
|
||||
vebegin "applying $conf"
|
||||
if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
|
||||
|
Loading…
Reference in New Issue
Block a user