diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-10-18 16:05:51 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-10-18 16:05:51 -0400 |
| commit | 231d3e4ec98e3792519ffbe7f081e592ec31fdff (patch) | |
| tree | 8f9ca594ab5fbf771852bbd4669b8598eb370210 | |
| parent | 975185c8569260e759e8524a22aacb120def4544 (diff) | |
| download | initscripts-231d3e4ec98e3792519ffbe7f081e592ec31fdff.tar initscripts-231d3e4ec98e3792519ffbe7f081e592ec31fdff.tar.gz initscripts-231d3e4ec98e3792519ffbe7f081e592ec31fdff.tar.bz2 initscripts-231d3e4ec98e3792519ffbe7f081e592ec31fdff.tar.xz initscripts-231d3e4ec98e3792519ffbe7f081e592ec31fdff.zip | |
Add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254)
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | initscripts.spec | 1 | ||||
| -rw-r--r-- | sysctl.conf.README | 4 |
3 files changed, 6 insertions, 0 deletions
@@ -34,6 +34,7 @@ install: install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi if uname -m | grep -q s390 ; then \ install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi + install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig cp -af rc.d/init.d $(ROOT)/etc/rc.d/ diff --git a/initscripts.spec b/initscripts.spec index 0e850d2f..d4f2d578 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -168,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rc.d/init.d /etc/rc.d/init.d/* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local +%config(noreplace) /etc/sysctl.conf /usr/lib/sysctl.d/00-system.conf %exclude /etc/profile.d/debug* /etc/profile.d/* diff --git a/sysctl.conf.README b/sysctl.conf.README new file mode 100644 index 00000000..24cfe007 --- /dev/null +++ b/sysctl.conf.README @@ -0,0 +1,4 @@ +# System default settings live in /usr/lib/sysctl.d/00-system.conf. +# To override those settings, enter new settings here, or in an /etc/sysctl.d/<name>.conf file +# +# For more information, see sysctl.conf(5) and sysctl.d(5). |