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>

diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 90fab9d13ccc8d2ae37aaf74a7db5b340487e038..aaaf74ee1e1818793653c3fbba04f2b3a1f13371 100644 (file)
--- 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 80fd5fd482037dcea7f31e3cc2fe7cab91dca898..a84c2e842444e75d06b5debf12608b822a8a4927 100644 (file)
--- 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