code.ossystems Code Review - openembedded-core.git/blob

   1 From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@dominion.thruhere.net>
   3 Date: Sun, 9 Oct 2011 20:06:35 +0200
   4 Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing
   5
   6 This avoids an error on bootup
   7
   8 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
   9 ---
  10
  11 Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
  12
  13 Upstream-Status: Pending
  14
  15  alsactl/Makefile.am             |    2 +-
  16  alsactl/alsa-restore.service.in |    1 +
  17  2 files changed, 2 insertions(+), 1 deletions(-)
  18
  19 diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
  20 index 5cfc415..c3768c4 100644
  21 --- a/alsactl/Makefile.am
  22 +++ b/alsactl/Makefile.am
  23 @@ -34,7 +34,7 @@ install-data-hook:
  24  endif
  25
  26  edit = \
  27 -       $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
  28 +       $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
  29
  30  alsa-store.service: alsa-store.service.in
  31         $(edit)
  32 diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
  33 index e97d196..3b76710 100644
  34 --- a/alsactl/alsa-restore.service.in
  35 +++ b/alsactl/alsa-restore.service.in
  36 @@ -4,6 +4,7 @@ DefaultDependencies=no
  37  After=sysinit.target
  38  Before=shutdown.target
  39  Conflicts=shutdown.target
  40 +ConditionPathExists=@localstatedir@/lib/alsa/asound.state
  41
  42  [Service]
  43  Type=oneshot
  44 --
  45 1.6.6.1
  46