From 994557fe7d56d0278a02bfd8fa9df3ae390f135a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 30 May 2013 23:30:05 +0000 Subject: [PATCH] move kernel.panic to sysconfig, deprecating PANIC_REBOOT_TIME svn-id: @12688 --- rc.d/rc.sysinit | 2 +- sysconfig/system | 4 ---- sysctl.conf | 10 +++++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 39b17878..92f624c1 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -918,7 +918,7 @@ if ! is_yes "$VSERVER"; then if [ -n "$PANIC_REBOOT_TIME" -a "$PANIC_REBOOT_TIME" -gt "0" -a -f /proc/sys/kernel/panic ]; then show 'Setting %s seconds for kernel reboot after panic' "$PANIC_REBOOT_TIME"; busy - # NOTE: you should use /etc/sysctl.conf instead + # DEPRECATED: use /etc/sysctl.conf or kernel commandline instead if sysctl -q -w kernel.panic=$PANIC_REBOOT_TIME; then ok; else fail; fi fi diff --git a/sysconfig/system b/sysconfig/system index 79ad2cd4..722eca39 100644 --- a/sysconfig/system +++ b/sysconfig/system @@ -43,10 +43,6 @@ RUN_USERPNP=no # Setup kernel space PNP (2.4.x) RUN_KERNELPNP=no -# After how many seconds reboot system after kernel panic ? -# 0 - never reboot system (suggested 60) -PANIC_REBOOT_TIME=0 - # Do not allow users to login when system is starting # (but allow when it end "starting" process) ? DELAY_LOGIN=yes diff --git a/sysctl.conf b/sysctl.conf index fe470629..8b25adf5 100644 --- a/sysctl.conf +++ b/sysctl.conf @@ -40,7 +40,7 @@ net.ipv4.conf.default.rp_filter = 1 # Send ICMP redirects to other hosts ? # net.ipv4.conf.all.send_redirects = 1 -# Ignore all ICMP echo requests ? +# Ignore all ICMP echo requests ? # net.ipv4.icmp_echo_ignore_all = 1 # Ignore ICMP echo requests to broadcast and multicast addresses ? @@ -59,9 +59,9 @@ net.ipv4.conf.default.rp_filter = 1 # Bug-to-bug compatibility with some broken printers. On retransmit # try to send bigger packets to work around bugs in certain TCP -# stacks. Can be turned off by setting IPV4_RETRANS_COLLAPSE to ,,yes''. +# stacks. Can be turned off by setting IPV4_RETRANS_COLLAPSE to ,,yes''. # net.ipv4.tcp_retrans_collapse = 1 - + # Disable select acknowledgments after RFC2018 ? # TCP may experience poor performance when multiple packets are lost # from one window of data. With the limited information available @@ -134,6 +134,10 @@ net.ipv4.conf.default.rp_filter = 1 # Enable the magic-sysrq key kernel.sysrq = 1 +# After how many seconds reboot system after kernel panic? +# 0 - never reboot system (suggested 60) +#kernel.panic = 60 + # # GRSECURITY http://www.grsecurity.org # -- 2.44.0