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

[glen]

Author: glen
Date: Thu May 30 20:23:49 2013
New Revision: 12668

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
   rc-scripts/trunk/sysconfig/system
Log:
turn off by default RUN_USERPNP and RUN_KERNELPNP


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Thu May 30 20:23:49 2013
@@ -434,11 +434,11 @@
 	fi
 
 	# set up pnp and kernel pnp
-	if [ -z "$nopnp" ]; then
-		if ! is_no "$RUN_USERPNP" && [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
+	if is_yes "$RUN_USERPNP" || is_yes "$RUN_KERNELPNP"; then
+		if [ -z "$nopnp" ] && is_yes "$RUN_USERPNP" && [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ]; then
 			run_cmd "Setting up ISA PNP devices (userspace pnp)" /sbin/isapnp /etc/isapnp/isapnp.conf
 		fi
-		if ! is_no "$RUN_KERNELPNP"; then
+		if [ -z "$nopnp" ] && is_yes "$RUN_KERNELPNP"; then
 			modprobe -s isa-pnp
 			if [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
 				show "Setting up ISA PNP devices (kernelspace pnp)"; busy

Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system	(original)
+++ rc-scripts/trunk/sysconfig/system	Thu May 30 20:23:49 2013
@@ -39,9 +39,9 @@
 DEFAULT_SERVICE_UMASK=022
 
 # Setup PNP using userspace tools?
-RUN_USERPNP=yes
+RUN_USERPNP=no
 # Setup kernel space PNP (2.4.x)
-RUN_KERNELPNP=yes
+RUN_KERNELPNP=no
 
 # After how many seconds reboot system after kernel panic ?
 # 0 - never reboot system (suggested 60)