forked from pool/alsa-utils
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
|
From f1eba0b5deb6c3988d6dd7317ccc931c09792843 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ikey Doherty <ikey@solus-project.com>
|
||
|
|
Date: Tue, 12 Dec 2017 13:32:34 +0000
|
||
|
|
Subject: [PATCH] alsactl: Only start restore service when asoundrc file exists
|
||
|
|
|
||
|
|
This solves the chicken and egg problem on fresh installations whereby
|
||
|
|
the alsa state file does not yet exist, and alsa-restore unit attempted
|
||
|
|
to launch without first having a state file.
|
||
|
|
|
||
|
|
Signed-off-by: Ikey Doherty <ikey@solus-project.com>
|
||
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||
|
|
---
|
||
|
|
alsactl/Makefile.am | 1 +
|
||
|
|
alsactl/alsa-restore.service.in | 1 +
|
||
|
|
2 files changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
|
||
|
|
index 90fab9d13ccc..aaaf74ee1e18 100644
|
||
|
|
--- a/alsactl/Makefile.am
|
||
|
|
+++ b/alsactl/Makefile.am
|
||
|
|
@@ -41,6 +41,7 @@ edit = \
|
||
|
|
$(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
|
||
|
|
-e 's,@mydatadir\@,$(mydatadir),g' \
|
||
|
|
-e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
|
||
|
|
+ -e 's,@asoundrcfile\@,$(ASOUND_STATE_DIR)/asound.state,g' \
|
||
|
|
< $< > $@ || rm $@
|
||
|
|
|
||
|
|
alsa-state.service: alsa-state.service.in
|
||
|
|
diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
|
||
|
|
index 80fd5fd48203..a84c2e842444 100644
|
||
|
|
--- a/alsactl/alsa-restore.service.in
|
||
|
|
+++ b/alsactl/alsa-restore.service.in
|
||
|
|
@@ -7,6 +7,7 @@
|
||
|
|
Description=Save/Restore Sound Card State
|
||
|
|
ConditionPathExists=!@daemonswitch@
|
||
|
|
ConditionPathExistsGlob=/dev/snd/control*
|
||
|
|
+ConditionPathExists=@asoundrcfile@
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
Type=oneshot
|
||
|
|
--
|
||
|
|
2.15.1
|
||
|
|
|