diff options
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch index e99dd515f0..e578dfe743 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001 | 1 | From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Fri, 29 Aug 2014 18:58:56 +0300 | 3 | Date: Fri, 29 Aug 2014 18:58:56 +0300 |
4 | Subject: [PATCH] alsactl: don't let systemd unit restore the volume when | 4 | Subject: [PATCH] alsactl: don't let systemd unit restore the volume when |
@@ -12,16 +12,20 @@ Upstream-Status: Pending | |||
12 | 12 | ||
13 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 13 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
14 | Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> | 14 | Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> |
15 | |||
16 | Rebased on 1.1.0. | ||
17 | |||
18 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
15 | --- | 19 | --- |
16 | alsactl/Makefile.am | 7 ++++--- | 20 | alsactl/Makefile.am | 7 ++++--- |
17 | alsactl/alsa-restore.service.in | 1 + | 21 | alsactl/alsa-restore.service.in | 1 + |
18 | 2 files changed, 5 insertions(+), 3 deletions(-) | 22 | 2 files changed, 5 insertions(+), 3 deletions(-) |
19 | 23 | ||
20 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am | 24 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am |
21 | index 47f06e9..b728c06 100644 | 25 | index cac8094..ff865dc 100644 |
22 | --- a/alsactl/Makefile.am | 26 | --- a/alsactl/Makefile.am |
23 | +++ b/alsactl/Makefile.am | 27 | +++ b/alsactl/Makefile.am |
24 | @@ -43,9 +43,10 @@ install-data-hook: | 28 | @@ -38,9 +38,10 @@ install-data-hook: |
25 | endif | 29 | endif |
26 | 30 | ||
27 | edit = \ | 31 | edit = \ |
@@ -36,17 +40,17 @@ index 47f06e9..b728c06 100644 | |||
36 | 40 | ||
37 | alsa-state.service: alsa-state.service.in | 41 | alsa-state.service: alsa-state.service.in |
38 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in | 42 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in |
39 | index 245a439..b017854 100644 | 43 | index 2884098..bac3ccc 100644 |
40 | --- a/alsactl/alsa-restore.service.in | 44 | --- a/alsactl/alsa-restore.service.in |
41 | +++ b/alsactl/alsa-restore.service.in | 45 | +++ b/alsactl/alsa-restore.service.in |
42 | @@ -10,6 +10,7 @@ DefaultDependencies=no | 46 | @@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State |
47 | ConditionPathExists=!@daemonswitch@ | ||
48 | ConditionPathExistsGlob=/dev/snd/control* | ||
43 | After=alsa-state.service | 49 | After=alsa-state.service |
44 | Before=shutdown.target | ||
45 | Conflicts=shutdown.target | ||
46 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state | 50 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state |
47 | 51 | ||
48 | [Service] | 52 | [Service] |
49 | Type=oneshot | 53 | Type=oneshot |
50 | -- | 54 | -- |
51 | 1.9.1 | 55 | 2.7.0.rc3 |
52 | 56 | ||