diff --git a/alsa-init.sh b/alsa-init.sh index b9c5afe..dc61dc1 100644 --- a/alsa-init.sh +++ b/alsa-init.sh @@ -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) diff --git a/alsa.changes b/alsa.changes index 28546b1..6d592d0 100644 --- a/alsa.changes +++ b/alsa.changes @@ -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 diff --git a/alsa.spec b/alsa.spec index 85aaf69..cfba78a 100644 --- a/alsa.spec +++ b/alsa.spec @@ -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 diff --git a/alsasound b/alsasound index d3f374d..0791e12 100644 --- a/alsasound +++ b/alsasound @@ -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 # diff --git a/set_default_volume b/set_default_volume index d63db05..79350c7 100644 --- a/set_default_volume +++ b/set_default_volume @@ -7,7 +7,7 @@ # written by Takashi Iwai # -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