From de33ef43313eb1075030b8615de15c56192dadc4 Mon Sep 17 00:00:00 2001
From: Florian La Roche <laroche@redhat.com>
Date: Thu, 11 Jul 2002 07:41:06 +0000
Subject: - /etc/init.d/functions:        daemon(): avoid starting another bash
        killproc(): avoid starting another bash for the default case - do not
 call "insmod -p" before loading the "st" module

---
 rc.d/rc.sysinit | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'rc.d/rc.sysinit')

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f1a09764..0c866bce 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -331,7 +331,7 @@ if [ -n "$IN_INITLOG" ]; then
     IN_INITLOG=
 fi
 
-if ! grep -iq nomodules /proc/cmdline >/dev/null 2>&1 && [ -f /proc/ksyms ]; then
+if ! grep -iq nomodules /proc/cmdline 2>/dev/null && [ -f /proc/ksyms ]; then
     USEMODULES=y
 fi
 
@@ -619,11 +619,8 @@ fi
 # If a SCSI tape has been detected, load the st module unconditionally
 # since many SCSI tapes don't deal well with st being loaded and unloaded
 if [ -f /proc/scsi/scsi ] && grep -q 'Type:   Sequential-Access' /proc/scsi/scsi 2>/dev/null ; then
-	if grep -qv ' 9 st' /proc/devices ; then
-		if [ -n "$USEMODULES" ]; then
-			# Try to load the module.  If it fails, ignore it...
-			insmod -p st >/dev/null 2>&1 && modprobe st >/dev/null 2>&1
-		fi
+	if grep -qv ' 9 st' /proc/devices && [ -n "$USEMODULES" ]; then
+		modprobe st >/dev/null 2>&1
 	fi
 fi
 
@@ -664,7 +661,7 @@ disk[17]=hdq; disk[18]=hdr; disk[19]=hds; disk[20]=hdt;
  
 if [ -x /sbin/hdparm ]; then
    for device in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
-   unset MULTIPLE_IO USE_DMA EIDE_32BIT LOOKAHEAD EXTRA_PARAMS
+	unset MULTIPLE_IO USE_DMA EIDE_32BIT LOOKAHEAD EXTRA_PARAMS
         if [ -f /etc/sysconfig/harddisk${disk[$device]} ]; then
                 . /etc/sysconfig/harddisk${disk[$device]}
                 HDFLAGS[$device]=
-- 
cgit v1.2.1