- Fix typos in the previous fix; the correct path is

/var/lib/alsa/asound.state

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=75
This commit is contained in:
Takashi Iwai 2011-03-31 13:03:56 +00:00 committed by Git OBS Bridge
parent a2011e972f
commit 8e85c10bac
5 changed files with 12 additions and 6 deletions

View File

@ -2,7 +2,7 @@
# alsa-init card#
/usr/bin/set_default_volume -f $1 >/dev/null 2>&1
test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
test -s /var/lib/alsa/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
# increase buffer-preallocation size (for PA)
if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 31 15:00:07 CEST 2011 - tiwai@suse.de
- Fix typos in the previous fix; the correct path is
/var/lib/alsa/asound.state
-------------------------------------------------------------------
Fri Mar 25 11:41:18 CET 2011 - tiwai@suse.de

View File

@ -167,8 +167,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
%if %suse_version < 1140
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
%endif
# install test wave file
mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
@ -185,7 +185,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
%if %suse_version < 1140
sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
sed -i -e 's@/var/lib/alsa/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
%endif
rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound

View File

@ -58,7 +58,7 @@
rc_reset
alsactl=/usr/sbin/alsactl
asoundcfg=/var/lib/asound.state
asoundcfg=/var/lib/alsa/asound.state
aconnect=/usr/bin/aconnect
#

View File

@ -7,7 +7,7 @@
# written by Takashi Iwai <tiwai@suse.de>
#
if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
if [ -f /var/lib/alsa/asound.state -a x$1 != x-f ]; then
/usr/sbin/alsactl restore >/dev/null 2>&1
exit 0
fi