move kernel.panic to sysconfig, deprecating PANIC_REBOOT_TIME

svn-id: @12688

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 39b17878e836cfef00f8c571e115e885eb68cc7b..92f624c10d51ffeb393384e0f29fd7333753005d 100755 (executable)
--- 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 79ad2cd46a32e0a4e2c0cc44687d6a780330dd37..722eca39fe7a90141fa684aea837101defc20c77 100644 (file)
--- 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 fe4706297b2e1c236da59eb8dbadf8129bee3d03..8b25adf55f6228fb181330a5777b42b15c09658e 100644 (file)
--- 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
 #