committing changes in /etc after emerge run

Package changes:
+media-sound/alsa-utils-1.0.24.2-r1

diff --git a/.etckeeper b/.etckeeper
index 29289ad77a0768dbbef5798fcb925be50fafd4d0..1d1af230b5638911c48102c5bd139f374c6b5c93 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -148,6 +148,7 @@ maybe chmod 0644 './colordiffrc'
 maybe chmod 0644 './colordiffrc-lightbg'
 maybe chmod 0755 './conf.d'
 maybe chmod 0644 './conf.d/acpid'
+maybe chmod 0644 './conf.d/alsasound'
 maybe chmod 0644 './conf.d/apache2'
 maybe chmod 0644 './conf.d/auditd'
 maybe chmod 0644 './conf.d/bluetooth'
@@ -574,6 +575,7 @@ maybe chmod 0755 './init.d'
 maybe chmod 0755 './init.d/NetworkManager'
 maybe chmod 0755 './init.d/acpid'
 maybe chmod 0755 './init.d/aiccu'
+maybe chmod 0755 './init.d/alsasound'
 maybe chmod 0755 './init.d/apache2'
 maybe chmod 0755 './init.d/auditd'
 maybe chmod 0755 './init.d/avahi-daemon'
@@ -727,6 +729,7 @@ maybe chmod 0644 './mke2fs.conf'
 maybe chmod 0644 './mlocate-cron.conf'
 maybe chmod 0755 './modprobe.d'
 maybe chmod 0644 './modprobe.d/aliases.conf'
+maybe chmod 0644 './modprobe.d/alsa.conf'
 maybe chmod 0644 './modprobe.d/blacklist.conf'
 maybe chmod 0644 './modprobe.d/i386.conf'
 maybe chmod 0644 './modprobe.d/pnp-aliases.conf'

diff --git a/conf.d/alsasound b/conf.d/alsasound
new file mode 100644 (file)
index 0000000..0a5d58f
--- /dev/null
+++ b/conf.d/alsasound
@@ -0,0 +1,31 @@
+# ENABLE_OSS_EMUL:
+# Do you want to enable in-kernel oss emulation?
+# no - Do not load oss emul drivers
+# yes - Load oss emul drivers if they're found
+
+ENABLE_OSS_EMUL="yes"
+
+# RESTORE_ON_START:
+# Do you want to restore your mixer settings?  If not, your cards will be
+# muted.
+# no - Do not restore state
+# yes - Restore state
+
+RESTORE_ON_START="yes"
+
+# SAVE_ON_STOP:
+# Do you want to save changes made to your mixer volumes when alsasound
+# stops? 
+# no - Do not save state
+# yes - Save state
+
+SAVE_ON_STOP="yes"
+
+# LOAD_ON_START:
+# Do you want to load sound modules when alsasound starts?
+# Note: The Gentoo ALSA developers encourage you to build your sound 
+#       drivers into the kernel unless the device is hotpluggable or 
+#       you need to supply specific options (such as model= to HD-Audio).
+# no - Do not load modules
+# yes - Load modules
+LOAD_ON_START="yes"

diff --git a/init.d/alsasound b/init.d/alsasound
new file mode 100755 (executable)
index 0000000..6d49375
--- /dev/null
+++ b/init.d/alsasound
@@ -0,0 +1,218 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.2 2011/10/23 15:59:07 polynomial-c Exp $
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+
+extra_commands="save restore"
+
+depend() {
+       need localmount
+       after bootmisc modules isapnp coldplug hotplug
+}
+
+load_modules() {
+       # List of drivers for each card.
+       local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')"
+
+       # Fall back on the automated aliases if we don't have ALSA configured properly...
+       if [ -z "${DRIVERS}" ] && \
+       ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then
+               ewarn "Could not detect custom ALSA settings.  Loading all detected alsa drivers."
+               DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)"
+               if [ -z "${DRIVERS}" ] ; then
+                       eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
+               fi
+       fi
+
+       if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then
+               DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
+       fi
+
+       # We want to ensure snd-seq is loaded as it is needed for things like
+       # timidity even if we don't use a real sequencer.
+       DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
+
+       # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
+       # compatibility
+       DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
+
+       local DRIVER= DMOD=
+       for DRIVER in ${DRIVERS} ; do
+               [ "${DRIVER}" = "off" ] && continue
+               DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')"
+               if ! grep -q "^${DMOD} " /proc/modules ; then
+                       ebegin "Loading: ${DRIVER}"
+                       modprobe ${DRIVER}
+                       eend $?
+               fi
+       done
+
+       if [ -f /proc/asound/seq/drivers ] ; then
+               local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)"
+               local SEQUENCER
+               for SEQUENCER in ${SEQUENCERS} ; do
+                       DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')"
+                       if ! grep -q "^${DMOD} " /proc/modules ; then
+                               ebegin "Loading: ${SEQUENCER}"
+                               modprobe ${SEQUENCER}
+                               eend $?
+                       fi
+               done
+       fi
+
+       for DRIVER in ${DRIVERS}
+       do
+               local TMP=${DRIVER##snd-}
+               TMP=${TMP##snd_}
+               if [ -x "${alsascrdir}/${TMP}" ] ; then
+                       ebegin "Running: ${alsascrdir}/${TMP}"
+                       "${alsascrdir}/${TMP}"
+                       eend $?
+               fi
+       done
+
+       if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then
+               eerror "ERROR: Failed to load necessary drivers"
+               return 1
+       fi
+}
+
+unload_modules_24() {
+       local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')"
+       local MODULE
+       for MODULE in ${LOADED_MODULES} ; do
+           rmmod "${MODULE}"
+       done
+       rmmod soundcore 2>/dev/null
+       rmmod gameport 2>/dev/null
+
+       lsmod | grep -vq '^snd'
+}
+
+unload_modules_recursive() {
+       local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")"
+
+       for module in ${revdeps} ; do
+               unload_modules_recursive "${module}"
+       done
+
+       vebegin "Unloading: $1"
+       rmmod --wait "$1"
+       veend $?
+}
+
+unload_modules_26() {
+       # First of all, remove the snd module and all the modules depending
+       # on it, this should remove already most of ALSA modules.
+       lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd
+
+       # Then find the remaining ones, and handle them too.
+       for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do
+               unload_modules_recursive "${module}"
+       done
+
+       lsmod | grep -vq "^snd"
+}
+
+terminate() {
+       #
+       # Kill processes holding open sound devices
+       #
+       # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*`
+       local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \
+                       /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \
+                       /dev/patmgr* /dev/sequencer* /dev/sndstat"
+       local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*"
+       fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null
+
+       # remove all sequencer connections if any
+       [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall
+}
+
+restore() {
+       ebegin "Restoring Mixer Levels"
+
+       if [ ! -r "${alsastatedir}/asound.state" ] ; then
+               ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
+               eend 0
+               return 0
+       fi
+
+       local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
+       local CARDNUM
+       for cardnum in ${cards}; do
+               [ -e /dev/snd/controlC${cardnum} ] || sleep 2
+               [ -e /dev/snd/controlC${cardnum} ] || sleep 2
+               [ -e /dev/snd/controlC${cardnum} ] || sleep 2
+               [ -e /dev/snd/controlC${cardnum} ] || sleep 2
+               alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \
+                       || ewarn "Errors while restoring defaults, ignoring"
+       done
+
+       for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+               [ -e "${ossfile}" ] || continue
+               # We use cat because I'm not sure if cp works properly on /proc
+               local procfile=${ossfile##${alsastatedir}/oss}
+               procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
+               if [ -e /proc/asound/"${procfile}"/oss ] ; then
+                   cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
+               fi
+       done
+
+       eend 0
+}
+
+save() {
+       ebegin "Storing ALSA Mixer Levels"
+
+       mkdir -p "${alsastatedir}"
+       if ! alsactl -f "${alsastatedir}/asound.state" store; then
+               eerror "Error saving levels."
+               eend 1
+               return 1
+       fi
+
+       for ossfile in /proc/asound/card*/pcm*/oss; do
+               [ -e "${ossfile}" ] || continue
+               local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
+               device="$(echo "${device}" | sed -e 's,/,_,g')"
+               mkdir -p "${alsastatedir}/oss/"
+               cp "${ossfile}" "${alsastatedir}/oss/${device}"
+       done
+
+       eend 0
+}
+
+start() {
+       if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then
+               ebegin "Loading ALSA modules"
+               eindent
+               load_modules
+               eoutdent
+               eend $? || return 1
+       fi
+
+       if [ ! -d /proc/asound ]; then
+               eerror "ALSA failed to load."
+               eend 1
+               return 1
+       elif [ "${RESTORE_ON_START}" = "yes" ]; then
+               restore
+       fi
+
+       return 0
+}
+
+stop() {
+       if [ ! -d /proc/asound ] ; then
+               eerror "ALSA is not loaded"
+               return 0
+       fi
+
+       [ "${SAVE_ON_STOP}" = "yes" ] && save
+
+       return 0
+}

diff --git a/modprobe.d/alsa.conf b/modprobe.d/alsa.conf
new file mode 100644 (file)
index 0000000..40e99df
--- /dev/null
+++ b/modprobe.d/alsa.conf
@@ -0,0 +1,38 @@
+# Alsa kernel modules' configuration file.
+
+# ALSA portion
+alias char-major-116 snd
+# OSS/Free portion
+alias char-major-14 soundcore
+
+##
+## IMPORTANT:
+## You need to customise this section for your specific sound card(s)
+## and then run `update-modules' command.
+## Read alsa-driver's INSTALL file in /usr/share/doc for more info.
+##
+##  ALSA portion
+## alias snd-card-0 snd-interwave
+## alias snd-card-1 snd-ens1371
+##  OSS/Free portion
+## alias sound-slot-0 snd-card-0
+## alias sound-slot-1 snd-card-1
+##
+
+# OSS/Free portion - card #1
+alias sound-service-0-0 snd-mixer-oss
+alias sound-service-0-1 snd-seq-oss
+alias sound-service-0-3 snd-pcm-oss
+alias sound-service-0-8 snd-seq-oss
+alias sound-service-0-12 snd-pcm-oss
+##  OSS/Free portion - card #2
+## alias sound-service-1-0 snd-mixer-oss
+## alias sound-service-1-3 snd-pcm-oss
+## alias sound-service-1-12 snd-pcm-oss
+
+alias /dev/mixer snd-mixer-oss
+alias /dev/dsp snd-pcm-oss
+alias /dev/midi snd-seq-oss
+
+# Set this to the correct number of cards.
+options snd cards_limit=1