* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-utils/files: alsasound.confd alsasound.initd
@ 2007-12-29 6:38 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson (robbat2) @ 2007-12-29 6:38 UTC (permalink / raw
To: gentoo-commits
robbat2 07/12/29 06:38:00
Modified: alsasound.confd alsasound.initd
Log:
Add variables to block the automatic module load/unload, to help out cases where they do weird things, like my G5 with snd-aoa.
(Portage version: 2.1.4_rc11)
Revision Changes Path
1.3 media-sound/alsa-utils/files/alsasound.confd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?r1=1.2&r2=1.3
Index: alsasound.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd,v
retrieving revision 1.2
retrieving revision 1.3
diff -p -w -b -B -u -u -r1.2 -r1.3
--- alsasound.confd 21 Apr 2005 09:07:45 -0000 1.2
+++ alsasound.confd 29 Dec 2007 06:37:59 -0000 1.3
@@ -20,3 +20,15 @@ RESTORE_ON_START="yes"
# yes - Save state
SAVE_ON_STOP="yes"
+
+# LOAD_ON_START:
+# Do you want to load sound modules when alsasound starts?
+# no - Do not load modules
+# yes - Load modules
+LOAD_ON_START="yes"
+
+# UNLOAD_ON_STOP:
+# Do you want to unload sound modules when alsasound stops?
+# no - Do not unload modules
+# yes - Unload modules
+UNLOAD_ON_STOP="yes"
1.6 media-sound/alsa-utils/files/alsasound.initd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?r1=1.5&r2=1.6
Index: alsasound.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -w -b -B -u -u -r1.5 -r1.6
--- alsasound.initd 19 Mar 2007 21:32:12 -0000 1.5
+++ alsasound.initd 29 Dec 2007 06:37:59 -0000 1.6
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.5 2007/03/19 21:32:12 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.6 2007/12/29 06:37:59 robbat2 Exp $
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
@@ -187,7 +187,7 @@ save() {
}
start() {
- if [ -f /proc/modules ] ; then
+ if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then
ebegin "Loading ALSA modules"
eindent
load_modules
@@ -218,7 +218,7 @@ stop() {
terminate
eend 0
- if [ -f /proc/modules ]; then
+ if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then
local ver="24"
rmmod --version | grep -q module-init-tools && ver="26"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/alsa-utils/files: alsasound.confd alsasound.initd
@ 2008-05-15 18:16 Steve Dibb (beandog)
0 siblings, 0 replies; 2+ messages in thread
From: Steve Dibb (beandog) @ 2008-05-15 18:16 UTC (permalink / raw
To: gentoo-commits
beandog 08/05/15 18:16:19
Modified: alsasound.confd alsasound.initd
Log:
Add conf.d option to terminate processes in init script, bug 222267
(Portage version: 2.1.5)
Revision Changes Path
1.4 media-sound/alsa-utils/files/alsasound.confd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd?r1=1.3&r2=1.4
Index: alsasound.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.confd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsasound.confd 29 Dec 2007 06:37:59 -0000 1.3
+++ alsasound.confd 15 May 2008 18:16:18 -0000 1.4
@@ -32,3 +32,12 @@
# no - Do not unload modules
# yes - Unload modules
UNLOAD_ON_STOP="yes"
+
+# KILLPROC_ON_STOP
+# Do you want to kill any processes using ALSA when alsasound stops?
+# Warning: may create some unexpected window behavior or
+# crash running applications.
+# Also, if you are not using modules, it is safe to disable this.
+# no - Do not terminate ALSA processes
+# yes - Kill running processes using ALSA
+KILLPROC_ON_STOP="yes"
1.7 media-sound/alsa-utils/files/alsasound.initd
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd?r1=1.6&r2=1.7
Index: alsasound.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsasound.initd 29 Dec 2007 06:37:59 -0000 1.6
+++ alsasound.initd 15 May 2008 18:16:18 -0000 1.7
@@ -1,5 +1,5 @@
#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.6 2007/12/29 06:37:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.7 2008/05/15 18:16:18 beandog Exp $
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
@@ -214,9 +214,11 @@
[ "${SAVE_ON_STOP}" = "yes" ] && save
- ebegin "Killing processes using ALSA"
- terminate
- eend 0
+ if [ "${KILLPROC_ON_STOP}" = "yes" ] ; then
+ ebegin "Killing processes using ALSA"
+ terminate
+ eend 0
+ fi
if [ -f /proc/modules ] && [ "${UNLOAD_ON_STOP}" = "yes" ]; then
local ver="24"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-15 18:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-15 18:16 [gentoo-commits] gentoo-x86 commit in media-sound/alsa-utils/files: alsasound.confd alsasound.initd Steve Dibb (beandog)
-- strict thread matches above, loose matches on Subject: below --
2007-12-29 6:38 Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox