diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
| commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
| tree | 3a122662900195e7b14067a03cd5124358db9daf /sysctl.conf.README | |
| parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
| parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
| download | initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.gz initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.bz2 initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.tar.xz initscripts-9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3.zip | |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'sysctl.conf.README')
| -rw-r--r-- | sysctl.conf.README | 4 |
1 files changed, 4 insertions, 0 deletions
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). |