diff options
| author | Petr Lautrbach <plautrba@redhat.com> | 2010-05-10 17:21:04 +0200 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2010-05-11 10:20:04 +0200 |
| commit | 03f62929851774e0b91438bff50b82c4eb81046f (patch) | |
| tree | dd12b4c3692d826886bbd42fc5ce15860d9a5a59 | |
| parent | eaeb72231350ed442979a7616cf547859a885609 (diff) | |
| download | initscripts-9.03.7-1.1.tar initscripts-9.03.7-1.1.tar.gz initscripts-9.03.7-1.1.tar.bz2 initscripts-9.03.7-1.1.tar.xz initscripts-9.03.7-1.1.zip | |
let sysctl reads also from /etc/sysctl.d/*.conf files (#574870)initscripts-9.03.7-1.1
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 4 | ||||
| -rw-r--r-- | sysctl.conf | 2 |
4 files changed, 7 insertions, 1 deletions
@@ -16,6 +16,7 @@ install: mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin mkdir -p $(ROOT)$(mandir)/man{5,8} mkdir -p $(ROOT)/etc/rwtab.d $(ROOT)/etc/statetab.d + mkdir -p $(ROOT)/etc/sysctl.d mkdir -p $(ROOT)/var/lib/stateless/writable mkdir -p $(ROOT)/var/lib/stateless/state diff --git a/initscripts.spec b/initscripts.spec index 4ae96d6e..ae9fcb81 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -193,6 +193,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/rc.d/rc.local /etc/rc.d/rc.sysinit %config(noreplace) /etc/sysctl.conf +%dir /etc/sysctl.d %exclude /etc/profile.d/debug* /etc/profile.d/* /usr/sbin/sys-unconfig 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 diff --git a/sysctl.conf b/sysctl.conf index 5ab82d1b..51c5c98b 100644 --- a/sysctl.conf +++ b/sysctl.conf @@ -2,6 +2,8 @@ # # For binary values, 0 is disabled, 1 is enabled. See sysctl(8) and # sysctl.conf(5) for more details. +# +# Values might be overwritten by /etc/sysctl.d/*.conf files. # Controls IP packet forwarding net.ipv4.ip_forward = 0 |