aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-02-12 14:19:19 +0100
committerLukas Nykryn <lnykryn@redhat.com>2014-02-12 14:19:19 +0100
commit00d5e84240ed2fd858f1dc5a54185875ac677203 (patch)
tree44fc5123f9c32041a177c1e168b4cfed480e69dc
parent8aa58261239dcf9a2fcb7a1d6f18167454538fee (diff)
downloadinitscripts-00d5e84240ed2fd858f1dc5a54185875ac677203.tar
initscripts-00d5e84240ed2fd858f1dc5a54185875ac677203.tar.gz
initscripts-00d5e84240ed2fd858f1dc5a54185875ac677203.tar.bz2
initscripts-00d5e84240ed2fd858f1dc5a54185875ac677203.tar.xz
initscripts-00d5e84240ed2fd858f1dc5a54185875ac677203.zip
set shmmax and shmall defaults to match rhel6 values (#1056547)
-rw-r--r--sysctl.conf6
-rw-r--r--sysctl.conf.s3906
2 files changed, 12 insertions, 0 deletions
diff --git a/sysctl.conf b/sysctl.conf
index f8484efa..fe02481f 100644
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -7,3 +7,9 @@
net.bridge.bridge-nf-call-ip6tables = 0
net.bridge.bridge-nf-call-iptables = 0
net.bridge.bridge-nf-call-arptables = 0
+
+# Controls the maximum shared segment size, in bytes
+kernel.shmmax = 4294967295
+
+# Controls the maximum number of shared memory segments, in pages
+kernel.shmall = 268435456 \ No newline at end of file
diff --git a/sysctl.conf.s390 b/sysctl.conf.s390
index 12ae2846..03ccfd33 100644
--- a/sysctl.conf.s390
+++ b/sysctl.conf.s390
@@ -15,3 +15,9 @@ kernel.sched_min_granularity_ns = 10000000
kernel.sched_wakeup_granularity_ns = 15000000
kernel.sched_tunable_scaling = 0
kernel.sched_latency_ns = 80000000
+
+# Controls the maximum shared segment size, in bytes
+kernel.shmmax = 4294967295
+
+# Controls the maximum number of shared memory segments, in pages
+kernel.shmall = 268435456 \ No newline at end of file