diff options
author | Virgil Dupras <hsoft@hardcoded.net> | 2017-05-08 12:16:58 -0400 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-07-11 11:10:20 +0200 |
commit | f79bf1ba54fd2cb5cb9b8fcbdc9e99fea1b9acc7 (patch) | |
tree | 5771d5a3708240fa21a817d4026c2be400182971 /media-sound | |
parent | profiles/arch/arm64: mask texlive[xindy] (diff) | |
download | gentoo-f79bf1ba54fd2cb5cb9b8fcbdc9e99fea1b9acc7.tar.gz gentoo-f79bf1ba54fd2cb5cb9b8fcbdc9e99fea1b9acc7.tar.bz2 gentoo-f79bf1ba54fd2cb5cb9b8fcbdc9e99fea1b9acc7.zip |
media-sound/alsa-utils: Fix initd delay script when there's no soundcard
Fixes #617782
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4570
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild (renamed from media-sound/alsa-utils/alsa-utils-1.1.4.ebuild) | 2 | ||||
-rw-r--r-- | media-sound/alsa-utils/files/alsasound.initd-r7 | 87 |
2 files changed, 88 insertions, 1 deletions
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.4.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild index 9c10bb2c4ec3..87137657c10e 100644 --- a/media-sound/alsa-utils/alsa-utils-1.1.4.ebuild +++ b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild @@ -45,7 +45,7 @@ src_install() { default dodoc seq/*/README.* - newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound + newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound insinto /etc/modprobe.d diff --git a/media-sound/alsa-utils/files/alsasound.initd-r7 b/media-sound/alsa-utils/files/alsasound.initd-r7 new file mode 100644 index 000000000000..da2d5b349b82 --- /dev/null +++ b/media-sound/alsa-utils/files/alsasound.initd-r7 @@ -0,0 +1,87 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d +alsahomedir=/var/run/alsasound + +extra_commands="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +restore() { + ebegin "Restoring Mixer Levels" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + 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 -E HOME="${alsahomedir}" -I -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" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + mkdir -p "${alsastatedir}" + if ! alsactl -E HOME="${alsahomedir}" -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 [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ]; then + save + fi + return 0 +} |