summaryrefslogtreecommitdiff
blob: 314b68ecc96e535988750bca3af6e35cbf15bb9d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
Index: src/soundcardBackend.py
===================================================================
RCS file: /usr/local/CVS/redhat-config-soundcard/src/soundcardBackend.py,v
retrieving revision 1.50
diff -u -b -B -r1.50 soundcardBackend.py
--- src/soundcardBackend.py	21 Jul 2006 07:37:22 -0000	1.50
+++ src/soundcardBackend.py	6 Sep 2006 06:12:47 -0000
@@ -233,7 +233,7 @@
     def rewriteModprobe(self, cardArray):
         
         try:
-            fd = open('/etc/modprobe.conf', 'r')
+            fd = open('/etc/modules.d/alsa', 'r')
             list = fd.readlines()
             fd.close()
         except:
@@ -279,8 +279,8 @@
                 modprobe.append("options %s index=%d\n" % (card.driver, card.index))
 
         try:
-            os.rename('/etc/modprobe.conf', '/etc/modprobe.conf.scs')
-            fd = open('/etc/modprobe.conf', 'w')
+            os.rename('/etc/modules.d/alsa', '/etc/modules.d/alsa.scs')
+            fd = open('/etc/modules.d/alsa', 'w')
             fd.writelines(modprobe)
             fd.close()
         except:            
@@ -365,7 +365,7 @@
         if self.card_index_changed:
             ret_mod = self.rewriteModprobe(cardArray)
             if not ret_mod:
-                errorDialog(_("Unable to write %s!") % ("/etc/modprobe.conf"))
+                errorDialog(_("Unable to write %s!") % ("/etc/modules.d/alsa"))
             elif ret_mod:
                 self.unloadModules()
                 self.loadModules(cardArray)
Index: src/system-config-soundcard.logger
===================================================================
RCS file: /usr/local/CVS/redhat-config-soundcard/src/system-config-soundcard.logger,v
retrieving revision 1.2
diff -u -b -B -r1.2 system-config-soundcard.logger
--- src/system-config-soundcard.logger	30 Jun 2006 12:07:38 -0000	1.2
+++ src/system-config-soundcard.logger	6 Sep 2006 06:12:47 -0000
@@ -6,13 +6,13 @@
 echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1
 echo -e "------- lspci -vn --------\n`lspci -vn`\n" >> $LOG_FILE 2>&1
 echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1
-echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1
+echo -e "------- /etc/modules.d/alsa --------\n`cat /etc/modules.d/alsa`\n" >> $LOG_FILE 2>&1
 echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1
 echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1
 echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1
-echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1
-echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1
+echo -e "------- qlist -I alsa-lib --------\n`qlist -I alsa-lib`\n" >> $LOG_FILE 2>&1
+echo -e "------- qlist -I alsa-utils --------\n`qlist -I alsa-utils`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1
 echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1
 echo -e "------- /etc/sysconfig/hwconf --------\n`cat /etc/sysconfig/hwconf`\n" >> $LOG_FILE 2>&1