All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Henningsson <david.henningsson@canonical.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: 1289730@bugs.launchpad.net, alsa-devel@alsa-project.org
Subject: Re: [RFC PATCH] alsactl: Do not run udev rule before datadir is mounted
Date: Fri, 13 Jun 2014 11:33:00 +0200	[thread overview]
Message-ID: <539AC54C.60504@canonical.com> (raw)
In-Reply-To: <s5hfvj9go7w.wl%tiwai@suse.de>

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]



On 2014-06-13 11:20, Takashi Iwai wrote:

>> +++ b/alsactl/90-alsa-restore.rules.in
>> @@ -1,4 +1,4 @@
>> -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", GOTO="alsa_restore_go"
>> +ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST=="@sbindir@", TEST=="@datadir@", GOTO="alsa_restore_go"
>>   GOTO="alsa_restore_end"
>
> IMO, it's better to use @mydatadir@ instead of @datadir@ here and...

Oops, sorry about that. Thanks for the review!

Attaching a fixup patch.

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic

[-- Attachment #2: 0001-alsactl-Fixup-test-for-mydatadir-sbindir.patch --]
[-- Type: text/x-patch, Size: 1399 bytes --]

>From 7402d0421df6782dd7af9a30f3bc1223057cd9f3 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Fri, 13 Jun 2014 11:31:44 +0200
Subject: [PATCH] alsactl: Fixup test for mydatadir/sbindir

Use the "mydatadir" name consistently.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 alsactl/90-alsa-restore.rules.in | 2 +-
 alsactl/Makefile.am              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
index 80fc043..c0c1b23 100644
--- a/alsactl/90-alsa-restore.rules.in
+++ b/alsactl/90-alsa-restore.rules.in
@@ -1,4 +1,4 @@
-ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST=="@sbindir@", TEST=="@datadir@", GOTO="alsa_restore_go"
+ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST=="@sbindir@", TEST=="@mydatadir@", GOTO="alsa_restore_go"
 GOTO="alsa_restore_end"
 
 LABEL="alsa_restore_go"
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index afbedb3..47f06e9 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -44,7 +44,7 @@ endif
 
 edit = \
 	$(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
-		  -e 's,@datadir\@,$(mydatadir),g' \
+		  -e 's,@mydatadir\@,$(mydatadir),g' \
 		  -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
 							< $< > $@ || rm $@
 
-- 
1.9.1


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]



  reply	other threads:[~2014-06-13  9:32 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-13  8:15 [RFC PATCH] alsactl: Do not run udev rule before datadir is mounted David Henningsson
2014-06-13  8:26 ` Jaroslav Kysela
2014-06-13  9:05   ` David Henningsson
2014-06-13  9:11     ` Jaroslav Kysela
2014-06-13  9:20     ` Takashi Iwai
2014-06-13  9:33       ` David Henningsson [this message]
2014-06-13 10:08         ` ALSA 1.0.28 release - request for testing Jaroslav Kysela
2014-06-13 10:52           ` David Henningsson
2014-06-13 17:17             ` Jaroslav Kysela
2014-06-13 10:59           ` Alexander E. Patrakov
2014-06-13 17:19             ` Jaroslav Kysela
2014-06-13 11:02           ` David Henningsson
2014-06-13 17:19             ` Jaroslav Kysela
2014-06-14 12:11           ` ALSA 1.0.28 release - Assertion failed Sergey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=539AC54C.60504@canonical.com \
    --to=david.henningsson@canonical.com \
    --cc=1289730@bugs.launchpad.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.