emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow files in sysctl.d to override sysctl.conf

Browse Source 
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:
William Hubbs 2012-03-24 14:37:08 -05:00
parent 8104618d10
commit 09327f429f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.d/sysctl.BSD.in
View File

@ -13,7 +13,7 @@ start()
local retval=0 var= comments= conf= local retval=0 var= comments= conf=
ebegin "Configuring kernel parameters" ebegin "Configuring kernel parameters"
eindent 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 if [ -r "$conf" ]; then
vebegin "applying $conf" vebegin "applying $conf"
while read var comments; do while read var comments; do

2
init.d/sysctl.Linux.in
View File

@ -15,7 +15,7 @@ start()
ebegin "Configuring kernel parameters" ebegin "Configuring kernel parameters"
eindent 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 if [ -r "$conf" ]; then
vebegin "applying $conf" vebegin "applying $conf"
if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then