aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/rc.sysinit20
2 files changed, 21 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 4adaad10..ea757266 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: inittab and /etc/rc.d scripts
Name: initscripts
-%define version 3.22
+%define version 3.23
Version: %{version}
Copyright: GPL
Group: Base
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 23ac3a98..38eb858c 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -63,6 +63,26 @@ if [ -x /sbin/quotaon ]; then
/sbin/quotaon /
fi
+# check for arguments
+
+mount -t proc /proc /proc
+if grep -i nopnp /proc/cmdline >/dev/null ; then
+ PNP=
+else
+ PNP=yes
+fi
+umount /proc
+
+# set up pnp
+if [ -x /sbin/isapnp -a -f /etc/isapnp.conf ]; then
+ if [ -n "$PNP" ]; then
+ echo "Setting up ISA PNP devices"
+ /sbin/isapnp /etc/isapnp.conf
+ else
+ echo "Skipping ISA PNP configuration at users request"
+ fi
+fi
+
# Remount the root filesystem read-write.
echo "Remounting root filesystem in read-write mode."
mount -n -o remount,rw /