From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 30 May 2013 18:23:49 +0000 (+0000)
Subject: turn off by default RUN_USERPNP and RUN_KERNELPNP
X-Git-Tag: 0.4.7~30
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=07e4dd15958b5ed0a6601892d00b732c3ddc9ac2;hp=236aa13c469ea4ec5e5fb35baec5b5f341431a8f;p=projects%2Frc-scripts.git

turn off by default RUN_USERPNP and RUN_KERNELPNP


svn-id: @12668
---

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index d50a5700..0afa083f 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -434,11 +434,11 @@ if ! is_yes "$VSERVER"; then
 	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
diff --git a/sysconfig/system b/sysconfig/system
index e152afa2..6e34bc02 100644
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -39,9 +39,9 @@ DEFAULT_SERVICE_LIMITS="-u unlimited -c 0"
 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)