From 4df132c0119dfd214b2b31bbcd4dc09e4c4901d6 Mon Sep 17 00:00:00 2001
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
Date: Thu, 12 Oct 2017 16:33:53 +0200
Subject: sysctl.conf.s390 dropped

  This is a follow up to 13d638c0a7df4a998429163b9a0189dcffa2393a.
---
 Makefile         |  2 --
 initscripts.spec |  1 -
 sysctl.conf.s390 | 23 -----------------------
 3 files changed, 26 deletions(-)
 delete mode 100644 sysctl.conf.s390

diff --git a/Makefile b/Makefile
index 3dab37d1..70caf6ab 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,6 @@ install:
 	install -m644  debug.csh debug.sh $(ROOT)/etc/profile.d
 	install -m755  sys-unconfig $(ROOT)/usr/sbin
 	install -m644  service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
-	if uname -m | grep -q s390 ; then \
-	  install -D -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
 
 	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 82985564..1f954644 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -129,7 +129,6 @@ fi
 %{_sysconfdir}/sysconfig/network-scripts/ifdown-isdn
 %ifarch s390 s390x
 %{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
-%{_prefix}/lib/sysctl.d/00-system.conf
 %endif
 %config(noreplace) %{_sysconfdir}/networks
 %config(noreplace) %{_sysconfdir}/rwtab
diff --git a/sysctl.conf.s390 b/sysctl.conf.s390
deleted file mode 100644
index 03ccfd33..00000000
--- a/sysctl.conf.s390
+++ /dev/null
@@ -1,23 +0,0 @@
-# Kernel sysctl configuration file
-#
-# For binary values, 0 is disabled, 1 is enabled.  See sysctl(8) and
-# sysctl.conf(5) for more details.
-
-# Controls the use of TCP syncookies
-net.ipv4.tcp_syncookies = 1
-
-# Do not spend as much process time too early to write out dirty pages
-vm.dirty_ratio = 40
-
-# Increase the average time a process runs continuously and also improve the
-# cache utilization and server style workload throughput at minor latency cost
-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
-- 
cgit v1.2.1