From 46d577416910925544976174b29e6a5b28f19138 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 27 Feb 2001 23:21:44 +0000
Subject: *** empty log message ***

---
 ChangeLog       | 11 +++++++++++
 rc.d/rc.sysinit | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28a632d5..a7f73aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2001-02-27  Bill Nottingham  <notting@redhat.com>
 
+	* initscripts.spec: 5.68-1
+
+	* rc.d/rc.sysinit:
+	mount usbdevfs before loading host controller module, don't explicitly load usb-storage
+
+	* rc.d/init.d/single:
+	don't explicitly kill things, init will do that
+
+	* sysconfig/network-scripts/ifup-post:
+	log that we're punching something through the firewall
+
 	* initscripts.spec: 5.67-1
 
 	* rc.d/rc.sysinit:
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 9e5a63cf..b4d52a61 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -366,6 +366,11 @@ if [ -x /sbin/depmod -a -n "$USEMODULES" ]; then
     fi
 fi
 
+# tweak isapnp settings if needed.
+if [ -n "$PNP" -a  -f /proc/isapnp -a -x /sbin/sndconfig ]; then
+    /sbin/sndconfig --mungepnp >/dev/null 2>&1
+fi
+
 # Load sound modules iff they need persistent DMA buffers
 if grep -q "options sound dmabuf=1" /etc/modules.conf 2>/dev/null ; then
   RETURN=0
@@ -608,11 +613,6 @@ if grep -q "ide-scsi" /proc/cmdline ; then
 	modprobe ide-scsi >/dev/null 2>&1
 fi
 
-# tweak isapnp settings if needed.
-if [ -n "$PNP" -a  -f /proc/isapnp -a -x /sbin/sndconfig ]; then
-    /sbin/sndconfig --mungepnp >/dev/null 2>&1
-fi
-
 # Generate a header that defines the boot kernel.
 KERNEL_TYPE=`uname -r | sed 's_^[^se]*\(\|smp\|enterprise\)$_-\1_;s_^-$__'`
 KERNEL_RELEASE=`uname -r | sed 's|smp\|enterprise||g'`
-- 
cgit v1.2.1