2016-02-17 16:56:14 +00:00
|
|
|
From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001
|
2011-10-09 18:13:23 +00:00
|
|
|
From: Koen Kooi <koen@dominion.thruhere.net>
|
2014-08-29 17:06:34 +00:00
|
|
|
Date: Fri, 29 Aug 2014 18:58:56 +0300
|
|
|
|
Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
|
|
|
|
asound.state is missing
|
2011-10-09 18:13:23 +00:00
|
|
|
|
|
|
|
This avoids an error on bootup
|
|
|
|
|
|
|
|
Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
|
|
|
|
|
2012-01-19 19:39:56 +00:00
|
|
|
Upstream-Status: Pending
|
2011-10-09 18:13:23 +00:00
|
|
|
|
2014-08-29 17:06:34 +00:00
|
|
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
|
|
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
|
2016-02-17 16:56:14 +00:00
|
|
|
|
|
|
|
Rebased on 1.1.0.
|
|
|
|
|
|
|
|
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
|
2014-08-29 17:06:34 +00:00
|
|
|
---
|
|
|
|
alsactl/Makefile.am | 7 ++++---
|
|
|
|
alsactl/alsa-restore.service.in | 1 +
|
|
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
|
2016-02-17 16:56:14 +00:00
|
|
|
index cac8094..ff865dc 100644
|
2014-08-29 17:06:34 +00:00
|
|
|
--- a/alsactl/Makefile.am
|
|
|
|
+++ b/alsactl/Makefile.am
|
2016-02-17 16:56:14 +00:00
|
|
|
@@ -38,9 +38,10 @@ install-data-hook:
|
2011-10-09 18:13:23 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
edit = \
|
2013-07-31 14:49:19 +00:00
|
|
|
- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
|
2014-08-29 17:06:34 +00:00
|
|
|
- -e 's,@mydatadir\@,$(mydatadir),g' \
|
2013-07-31 14:49:19 +00:00
|
|
|
- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
|
2014-08-29 17:06:34 +00:00
|
|
|
+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \
|
|
|
|
+ -e 's,@sbindir\@,$(sbindir),g' \
|
|
|
|
+ -e 's,@mydatadir\@,$(mydatadir),g' \
|
2013-07-31 14:49:19 +00:00
|
|
|
+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
|
|
|
|
< $< > $@ || rm $@
|
2011-10-09 18:13:23 +00:00
|
|
|
|
2013-07-31 14:49:19 +00:00
|
|
|
alsa-state.service: alsa-state.service.in
|
2014-08-29 17:06:34 +00:00
|
|
|
diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
|
2016-02-17 16:56:14 +00:00
|
|
|
index 2884098..bac3ccc 100644
|
2014-08-29 17:06:34 +00:00
|
|
|
--- a/alsactl/alsa-restore.service.in
|
|
|
|
+++ b/alsactl/alsa-restore.service.in
|
2016-02-17 16:56:14 +00:00
|
|
|
@@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State
|
|
|
|
ConditionPathExists=!@daemonswitch@
|
|
|
|
ConditionPathExistsGlob=/dev/snd/control*
|
2013-07-31 14:49:19 +00:00
|
|
|
After=alsa-state.service
|
2011-10-09 18:13:23 +00:00
|
|
|
+ConditionPathExists=@localstatedir@/lib/alsa/asound.state
|
|
|
|
|
|
|
|
[Service]
|
|
|
|
Type=oneshot
|
2014-08-29 17:06:34 +00:00
|
|
|
--
|
2016-02-17 16:56:14 +00:00
|
|
|
2.7.0.rc3
|
2014-08-29 17:06:34 +00:00
|
|
|
|