From patchwork Fri Jun 19 17:22:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 11614741 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0D5D13A0 for ; Fri, 19 Jun 2020 17:23:16 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 80BA820C09 for ; Fri, 19 Jun 2020 17:23:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="jwX5YUnE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80BA820C09 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9C6131683; Fri, 19 Jun 2020 19:22:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9C6131683 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1592587394; bh=fga6MceDVJGFHbVBbatca2gOOAjJV1SWlMb+Rr8S4lk=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=jwX5YUnE2RK0OX9K6LfXI2NF4XYLbdu52hMRVz10jsdybhKjzbXs3HVfnZTJGEk5y Qov5pIarbAqXAvS7e3Oypo0IGL4Sj5nZjY/9bhWq6LirkBGajQTmGQdc98FdOqEQBk V4eMaGcISgfAt6Y0GJQQyfbnszNwpdj7YqW0LHBc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id DF770F8025F; Fri, 19 Jun 2020 19:22:21 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 08A60F80271; Fri, 19 Jun 2020 19:22:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 324C8F80245 for ; Fri, 19 Jun 2020 19:22:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 324C8F80245 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E33ADAB64 for ; Fri, 19 Jun 2020 17:22:12 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Subject: [PATCH alsa-lib] conf: Add /usr/etc to the default search paths Date: Fri, 19 Jun 2020 19:22:12 +0200 Message-Id: <20200619172212.26735-1-tiwai@suse.de> X-Mailer: git-send-email 2.16.4 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" There's been some recent action to move the distribution-default setup from /etc to /usr/etc, and we should follow that, too. This patch adds /usr/etc/alsa.conf.d and /usr/etc/alsa.conf to the default search paths. Signed-off-by: Takashi Iwai --- src/conf/alsa.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index 18427ec6c4c6..aea1fe24f73c 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -8,6 +8,8 @@ { func load files [ + "/usr/etc/alsa/conf.d" + "/usr/etc/asound.conf" "/etc/alsa/conf.d" "/etc/asound.conf" "~/.asoundrc"