blob: 907ca5ce0e52151b59bc911404bb73af2f6a5dc1 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From b9d41b784657152a4c5683a9458dffab557f0689 Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -05002From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 29 Aug 2014 18:58:56 +0300
4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
5 asound.state is missing
6
7This avoids an error on bootup
8
9Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
10
11Upstream-Status: Pending
12
13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050015
16Rebased on 1.1.0.
17
18Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Patrick Williamsc124f4f2015-09-15 14:41:29 -050019---
20 alsactl/Makefile.am | 7 ++++---
21 alsactl/alsa-restore.service.in | 1 +
22 2 files changed, 5 insertions(+), 3 deletions(-)
23
24diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
Brad Bishop316dfdd2018-06-25 12:45:53 -040025index 90fab9d..190525a 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050026--- a/alsactl/Makefile.am
27+++ b/alsactl/Makefile.am
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050028@@ -38,9 +38,10 @@ install-data-hook:
Patrick Williamsc124f4f2015-09-15 14:41:29 -050029 endif
30
31 edit = \
32- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
33- -e 's,@mydatadir\@,$(mydatadir),g' \
34- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
35+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \
36+ -e 's,@sbindir\@,$(sbindir),g' \
37+ -e 's,@mydatadir\@,$(mydatadir),g' \
38+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
39 < $< > $@ || rm $@
40
41 alsa-state.service: alsa-state.service.in
42diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
Brad Bishop316dfdd2018-06-25 12:45:53 -040043index 80fd5fd..6beb36d 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050044--- a/alsactl/alsa-restore.service.in
45+++ b/alsactl/alsa-restore.service.in
Brad Bishop316dfdd2018-06-25 12:45:53 -040046@@ -7,6 +7,7 @@
47 Description=Save/Restore Sound Card State
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050048 ConditionPathExists=!@daemonswitch@
49 ConditionPathExistsGlob=/dev/snd/control*
Patrick Williamsc124f4f2015-09-15 14:41:29 -050050+ConditionPathExists=@localstatedir@/lib/alsa/asound.state
51
52 [Service]
53 Type=oneshot
54--
Brad Bishop316dfdd2018-06-25 12:45:53 -0400552.14.2
Patrick Williamsc124f4f2015-09-15 14:41:29 -050056