- user and kernelspace PNP

svn-id: @1003

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index a598eadd66d72c93b7fecdcce347a1546a747f2c..2b6193ae66e7ee8334777a59f9085af9563389ec 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.99 2002/03/19 17:46:05 misiek Exp $
+# $Id: rc.sysinit,v 1.100 2002/03/19 18:35:11 misiek Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:     Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -11,6 +11,20 @@
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
+# we need /proc mounted before everything
+mount -n -o gid=17 -t proc /proc /proc
+
+# Choose Hardware profile
+rm -f /var/run/hwprofile 2> /dev/null
+if [ -f /etc/sysconfig/hwprof ]; then
+    . /etc/sysconfig/hwprof
+    if is_yes "${HWPROFILES}" && [ -x /sbin/hwprofile -a -d /etc/sysconfig/hwprofiles/data ]; then
+       mount -n / -o rw,remount
+       /sbin/hwprofile -qf
+       mount -n / -o ro,remount
+    fi
+fi
+
 # NLS
 if [ -r /etc/sysconfig/i18n ]; then
        . /etc/sysconfig/i18n
@@ -42,7 +56,8 @@ if [ -r /etc/sysconfig/system ]; then
        . /etc/sysconfig/system
 else
        RUN_SULOGIN_ON_ERR=yes
-       RUN_ISAPNP=yes
+        RUN_USERPNP=yes
+        RUN_KERNELPNP=yes
        PANIC_REBOOT_TIME=0
        DELAY_LOGIN=yes
        CLEAN_TMP=no
@@ -208,12 +223,15 @@ fi
 
 # set up pnp and kernel pnp
 if [ -n "$PNP" ]; then
-    if [ -x /sbin/isapnp -a -f /etc/isapnp/isapnp.conf ] && is_yes "$RUN_ISAPNP"; then
+    if 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 [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
-       show "Setting up ISA PNP devices (kernelspace pnp)"; busy
-       cat /etc/isapnp/isapnp-kernel.conf > /proc/isapnp && (deltext; ok) || (deltext; fail)
+    if is_yes "$RUN_KERNELPNP"; then
+       /sbin/modprobe -k isa-pnp 2> /dev/null
+       if [ -e /proc/isapnp -a -f /etc/isapnp/isapnp-kernel.conf ]; then
+           show "Setting up ISA PNP devices (kernelspace pnp)"; busy
+           grep -v "^#" /etc/isapnp/isapnp-kernel.conf > /proc/isapnp && (deltext; ok) || (deltext; fail)
+       fi
     fi
 fi
 

diff --git a/sysconfig/system b/sysconfig/system
index f055f1683163681856c10910da696f71ef93f0f6..f35ebd6deed69f0e596ad5ddf75f9d964eb6104d 100644 (file)
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -1,4 +1,4 @@
-# $Id: system,v 1.21 2002/03/19 17:42:33 misiek Exp $
+# $Id: system,v 1.22 2002/03/19 18:35:14 misiek Exp $
 
 # Do you want colorized starting scripts ?
 COLOR_INIT=yes
@@ -17,8 +17,10 @@ RUN_SULOGIN_ON_ERR=yes
 # $SERVICE_RUN_NICE_LEVEL is not defined in /etc/sysconfig/<service>
 DEFAULT_SERVICE_RUN_NICE_LEVEL=0
 
-# Run isapnp at system startup ?
-RUN_ISAPNP=yes
+# Setup PNP using userspace tools?
+RUN_USERPNP=yes
+# Setup kernel space PNP (2.4.x)
+RUN_KERNELPNP=yes
 
 # After how many seconds reboot system after kernel panic ?
 # 0 - never reboot system (suggested 60)