summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-10 08:32:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:24 +0000
commit432c6cff0fd57e1f5e22f11615b4e6ccfec014cc (patch)
tree1ebf01ed4d1fb88e9e8ade3b8298782be9ceae13 /meta/recipes-bsp/alsa-state/alsa-state/alsa-state
parentc86797abdfc6db4b22710cca7924396c16eb6fc0 (diff)
downloadpoky-432c6cff0fd57e1f5e22f11615b4e6ccfec014cc.tar.gz
alsa-state: move state files to localstatedir
alsactl creates the state files in /var/lib/alsa by default so switch alsa-state to use files in that location. Further, update the alsa-state init script to have the location of the state files sed'ed into the script at do_install time (so as to remove hard coding of directory paths). (From OE-Core rev: 896924c72e7b37c18819229e8160c34cdf4465c8) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/alsa-state/alsa-state/alsa-state')
-rwxr-xr-xmeta/recipes-bsp/alsa-state/alsa-state/alsa-state6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
index 84cdf03750..9850791497 100755
--- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
+++ b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
@@ -9,9 +9,9 @@
9 9
10asound_restore(){ 10asound_restore(){
11 echo "ALSA: Restoring mixer settings..." 11 echo "ALSA: Restoring mixer settings..."
12 if test -x /usr/sbin/alsactl -a -e /etc/asound.state 12 if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state
13 then 13 then
14 /usr/sbin/alsactl -f /etc/asound.state restore & 14 /usr/sbin/alsactl -f #STATEDIR#/asound.state restore &
15 fi 15 fi
16} 16}
17 17
@@ -19,7 +19,7 @@ asound_store(){
19 echo "ALSA: Storing mixer settings..." 19 echo "ALSA: Storing mixer settings..."
20 if test -x /usr/sbin/alsactl 20 if test -x /usr/sbin/alsactl
21 then 21 then
22 /usr/sbin/alsactl -f /etc/asound.state store 22 /usr/sbin/alsactl -f #STATEDIR#/asound.state store
23 fi 23 fi
24} 24}
25 25