From: Ikey Doherty Date: Tue, 12 Dec 2017 13:32:34 +0000 (+0000) Subject: alsactl: Only start restore service when asoundrc file exists X-Git-Tag: v1.1.6~4 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f1eba0b5deb6c3988d6dd7317ccc931c09792843;p=alsa-utils.git 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 Signed-off-by: Takashi Iwai --- diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index 90fab9d..aaaf74e 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 80fd5fd..a84c2e8 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