From patchwork Fri Jun 13 09:33:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Henningsson X-Patchwork-Id: 4347871 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8E6219F314 for ; Fri, 13 Jun 2014 09:33:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2E242028D for ; Fri, 13 Jun 2014 09:33:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 70979201CD for ; Fri, 13 Jun 2014 09:33:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1E545261A9A; Fri, 13 Jun 2014 11:33:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY, URIBL_BLACK autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 7F76D2619D7; Fri, 13 Jun 2014 11:33:10 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1AF90261A3D; Fri, 13 Jun 2014 11:33:09 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 1B0DB2619D7 for ; Fri, 13 Jun 2014 11:32:59 +0200 (CEST) Received: from hd9483857.selulk5.dyn.perspektivbredband.net ([217.72.56.87] helo=[192.168.8.102]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1WvNr0-00046W-7G; Fri, 13 Jun 2014 09:32:58 +0000 Message-ID: <539AC54C.60504@canonical.com> Date: Fri, 13 Jun 2014 11:33:00 +0200 From: David Henningsson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Takashi Iwai References: <1402647348-25604-1-git-send-email-david.henningsson@canonical.com> <539AB5C7.6020501@perex.cz> <539ABEF0.7020508@canonical.com> In-Reply-To: Cc: 1289730@bugs.launchpad.net, alsa-devel@alsa-project.org Subject: Re: [alsa-devel] [RFC PATCH] alsactl: Do not run udev rule before datadir is mounted X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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. From 7402d0421df6782dd7af9a30f3bc1223057cd9f3 Mon Sep 17 00:00:00 2001 From: David Henningsson 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 --- 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