| 1 |
robbat2 07/12/29 06:38:00 |
| 2 |
|
| 3 |
Modified: alsasound.confd alsasound.initd |
| 4 |
Log: |
| 5 |
Add variables to block the automatic module load/unload, to help out cases where they do weird things, like my G5 with snd-aoa. |
| 6 |
(Portage version: 2.1.4_rc11) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-sound/alsa-utils/files/alsasound.confd |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: alsasound.confd |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -p -w -b -B -u -u -r1.2 -r1.3 |
| 21 |
--- alsasound.confd 21 Apr 2005 09:07:45 -0000 1.2 |
| 22 |
+++ alsasound.confd 29 Dec 2007 06:37:59 -0000 1.3 |
| 23 |
@@ -20,3 +20,15 @@ RESTORE_ON_START="yes" |
| 24 |
# yes - Save state |
| 25 |
|
| 26 |
SAVE_ON_STOP="yes" |
| 27 |
+ |
| 28 |
+# LOAD_ON_START: |
| 29 |
+# Do you want to load sound modules when alsasound starts? |
| 30 |
+# no - Do not load modules |
| 31 |
+# yes - Load modules |
| 32 |
+LOAD_ON_START="yes" |
| 33 |
+ |
| 34 |
+# UNLOAD_ON_STOP: |
| 35 |
+# Do you want to unload sound modules when alsasound stops? |
| 36 |
+# no - Do not unload modules |
| 37 |
+# yes - Unload modules |
| 38 |
+UNLOAD_ON_STOP="yes" |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.6 media-sound/alsa-utils/files/alsasound.initd |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.6&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.6&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?r1=1.5&r2=1.6 |
| 47 |
|
| 48 |
Index: alsasound.initd |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v |
| 51 |
retrieving revision 1.5 |
| 52 |
retrieving revision 1.6 |
| 53 |
diff -p -w -b -B -u -u -r1.5 -r1.6 |
| 54 |
--- alsasound.initd 19 Mar 2007 21:32:12 -0000 1.5 |
| 55 |
+++ alsasound.initd 29 Dec 2007 06:37:59 -0000 1.6 |
| 56 |
@@ -1,5 +1,5 @@ |
| 57 |
#!/sbin/runscript |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.5 2007/03/19 21:32:12 uberlord Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.6 2007/12/29 06:37:59 robbat2 Exp $ |
| 60 |
# Copyright 2007 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
@@ -187,7 +187,7 @@ save() { |
| 64 |
} |
| 65 |
|
| 66 |
start() { |
| 67 |
- if [ -f /proc/modules ] ; then |
| 68 |
+ if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then |
| 69 |
ebegin "Loading ALSA modules" |
| 70 |
eindent |
| 71 |
load_modules |
| 72 |
@@ -218,7 +218,7 @@ stop() { |
| 73 |
terminate |
| 74 |
eend 0 |
| 75 |
|
| 76 |
- if [ -f /proc/modules ]; then |
| 77 |
+ if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then |
| 78 |
local ver="24" |
| 79 |
rmmod --version | grep -q module-init-tools && ver="26" |
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
-- |
| 85 |
gentoo-commits@g.o mailing list |
Archives