From 86d21e93b2cd2ada639be6a3748fa438d9ee1c9d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 8 Feb 2000 20:27:02 +0000
Subject: load modules, not aliases. Also, load sound-slot-0 if aliased

---
 ChangeLog       | 8 --------
 rc.d/rc.sysinit | 9 +++++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89f17574..8bde7dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,14 +16,6 @@
 	* initscripts.spec, rc.d/init.d/random:
 	fix bug 9102
 
-2000-02-04  Bill Nottingham  <notting@redhat.com>
-
-	* ChangeLog, initscripts.spec:
-	*** empty log message ***
-
-	* lang.csh, lang.sh:
-	if LC_ALL/LINGUAS == LANG, don't set them
-
 2000-02-04  Bill Nottingham  <notting@redhat.com>
 
 	* lang.csh, lang.sh:
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 0fd30a69..f5860992 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -265,12 +265,17 @@ fi
 RETURN=0
 alias=`egrep -s "^alias[[:space:]]+sound[[:space:]]+" /etc/conf.modules | awk '{ print $3 }'`
 if [ -n "$alias" -a "$alias" != "off" ] ; then
-      action "Loading sound module ($alias)" modprobe sound
+      action "Loading sound module ($alias)" modprobe $alias
+      RETURN=$?
+fi
+alias=`egrep -s "^alias[[:space:]]+sound-slot-0[[:space:]]+" /etc/conf.modules | awk '{ print $3 }'`
+if [ -n "$alias" -a "$alias" != "off" ] ; then
+      action "Loading sound module ($alias)" modprobe $alias
       RETURN=$?
 fi
 alias=`egrep -s "^alias[[:space:]]+midi[[:space:]]+" /etc/conf.modules | awk '{ print $3 }'`
 if [ -n "$alias" -a "$alias" != "off" ]; then
-      action "Loading midi module ($alias)" modprobe midi
+      action "Loading midi module ($alias)" modprobe $alias
 fi
 
 # Load mixer settings
-- 
cgit v1.2.1