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 Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
  11
  12 Upstream-Status: Pending
  13
  14 Index: alsa-utils-1.0.27.2/alsactl/Makefile.am
  15 ===================================================================
  16 --- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am
  17 +++ alsa-utils-1.0.27.2/alsactl/Makefile.am
  18 @@ -36,8 +36,8 @@ install-data-hook:
  19  endif
  20
  21  edit = \
  22 -       $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
  23 -                 -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
  24 +       $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \
  25 +              -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
  26                                                         < $< > $@ || rm $@
  27
  28  alsa-state.service: alsa-state.service.in
  29 Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
  30 ===================================================================
  31 --- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in
  32 +++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
  33 @@ -10,6 +10,7 @@ DefaultDependencies=no
  34  After=alsa-state.service
  35  Before=shutdown.target
  36  Conflicts=shutdown.target
  37 +ConditionPathExists=@localstatedir@/lib/alsa/asound.state
  38
  39  [Service]
  40  Type=oneshot