]> git.alsa-project.org Git - alsa-utils.git/commitdiff
fix by Fernando Pablo Lopez-Lezcano <nando@ccrma.Stanford.EDU>:
authorTakashi Iwai <tiwai@suse.de>
Mon, 24 Nov 2003 11:42:24 +0000 (11:42 +0000)
committerTakashi Iwai <tiwai@suse.de>
Mon, 24 Nov 2003 11:42:24 +0000 (11:42 +0000)
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).

alsaconf/alsaconf.in

index ecb5b824f63564ea36fd3202c841343335ef8e64..9a89d0956d5ca5c7bda30f2c26a9d1c2ce2524f7 100644 (file)
@@ -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