From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 24 Nov 2003 11:42:24 +0000 (+0000)
Subject: fix by Fernando Pablo Lopez-Lezcano <nando@ccrma.Stanford.EDU>:
X-Git-Tag: v1.0.3~33
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=7d1c6cbf95e6d4a2e5707a2af5bf04b366bc6d09;p=alsa-utils.git

fix by Fernando Pablo Lopez-Lezcano <nando@ccrma.Stanford.EDU>:

Included is a patch that fixes alsaconf to work correctly under fedora
core 1. Otherwise alsaconf happily creates a modules.conf file that only
contains the alsa configuration and nothing else (a path in the if's
that does not create a $TMP file before the alsa configuration process
starts).
---

diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index ecb5b82..9a89d09 100644
--- a/alsaconf/alsaconf.in
+++ b/alsaconf/alsaconf.in
@@ -24,8 +24,10 @@ if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]; then
   distribution="suse"
 elif [ -f /etc/debian_version ]; then
   distribution="debian"
-elif [ -f /etc/redhat-release ]; then
+elif [ -f /etc/redhat-release -a `grep -c "Red Hat" /etc/redhat-release 2>/dev/null` != 0 ]; then
   distribution="redhat"
+elif [ -f /etc/fedora-release -a `grep -c "Fedora" /etc/fedora-release 2>/dev/null` != 0 ]; then
+  distribution="fedora"
 else
   distribution="unknown"
 fi
@@ -546,10 +548,8 @@ Do you want to modify ${cfgfile}?" 8 50 || acex 0
 	SOUND_CORE="snd"
     fi
 
-    if [ "$distribution" = "redhat" ] ; then
-        if grep -q "Red Hat" /etc/redhat-release >/dev/null 2>&1 ; then
-	    remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP
-        fi
+    if [ "$distribution" = "redhat" -o "$distribution" = "fedora" ] ; then
+        remove_ac_block < $cfgfile | remove_sndconfig_block | uniq > $TMP
     else
 	remove_ac_block < $cfgfile | remove_y2_block | uniq > $TMP
     fi