aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/rc.sysinit
diff options
context:
space:
mode:
authorPetr Lautrbach <plautrba@redhat.com>2010-05-10 17:21:04 +0200
committerPetr Lautrbach <plautrba@redhat.com>2010-05-11 10:20:04 +0200
commit03f62929851774e0b91438bff50b82c4eb81046f (patch)
treedd12b4c3692d826886bbd42fc5ce15860d9a5a59 /rc.d/rc.sysinit
parenteaeb72231350ed442979a7616cf547859a885609 (diff)
downloadinitscripts-03f62929851774e0b91438bff50b82c4eb81046f.tar
initscripts-03f62929851774e0b91438bff50b82c4eb81046f.tar.gz
initscripts-03f62929851774e0b91438bff50b82c4eb81046f.tar.bz2
initscripts-03f62929851774e0b91438bff50b82c4eb81046f.tar.xz
initscripts-03f62929851774e0b91438bff50b82c4eb81046f.zip
let sysctl reads also from /etc/sysctl.d/*.conf files (#574870)initscripts-9.03.7-1.1
Diffstat (limited to 'rc.d/rc.sysinit')
-rwxr-xr-xrc.d/rc.sysinit4
1 files changed, 3 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index bd0f0884..1c1f5d19 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -330,7 +330,9 @@ mount -n /dev/pts >/dev/null 2>&1
# Configure kernel parameters
update_boot_stage RCkernelparam
-sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+for file in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+ [ -f $file ] && sysctl -e -p $file >/dev/null 2>&1
+done
# Set the hostname.
update_boot_stage RChostname