SVN: rc-scripts/trunk: rc.d/rc.sysinit sysconfig/system sysctl.conf

[glen]

Author: glen
Date: Fri May 31 01:30:05 2013
New Revision: 12688

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
   rc-scripts/trunk/sysconfig/system
   rc-scripts/trunk/sysctl.conf
Log:
move kernel.panic to sysconfig, deprecating PANIC_REBOOT_TIME


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Fri May 31 01:30:05 2013
@@ -918,7 +918,7 @@
 
 	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
 

Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system	(original)
+++ rc-scripts/trunk/sysconfig/system	Fri May 31 01:30:05 2013
@@ -43,10 +43,6 @@
 # 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

Modified: rc-scripts/trunk/sysctl.conf
==============================================================================
--- rc-scripts/trunk/sysctl.conf	(original)
+++ rc-scripts/trunk/sysctl.conf	Fri May 31 01:30:05 2013
@@ -40,7 +40,7 @@
 # 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 @@
 
 # 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 @@
 # 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
 #