From patchwork Fri Aug 12 00:36:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Bernal Marin X-Patchwork-Id: 12941828 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A015136C for ; Fri, 12 Aug 2022 00:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660264629; x=1691800629; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=oXhRt65NYjW6187xXabFftOwWWNqETwxMwCLSqwSUus=; b=M68SKU7Nv0KMyNcm9nPpCZPKkxxW0yJGaClNxTTqv2Cep+1QwruV3NBy ZeKte5ezScxNEW/zD/TkRjzE1sGvlD8omYa3gdpgTkiu4u5nhaZM8Itk7 GZzt+YJkfH3DPzldSAcVWzvEGrt5FtSOTyrARb/vKH7klaQ5MtoVhUV6o G9xJ/rWOxqPP8Sydfot2b4f9boSgpySKOhyyXQ7hWPMfKOP9OjtaHrWk5 quyqtk8OE7V4it6S2OgdzGz/GWlVMUaKuUX0JfZJnlGvSRF5MdlRCZl/Q 5U7/HEe29fcWhiVmxWrKfwGWs00DC0D7Ph6Cfjbq3WrOyCZQmZ2RzGOtP Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10436"; a="274547584" X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="274547584" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2022 17:37:09 -0700 X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="556341057" Received: from ljreyesl-mobl.amr.corp.intel.com (HELO mbernalm-mobl.luna.miguelinux.com) ([10.252.249.161]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2022 17:37:08 -0700 From: Miguel Bernal Marin To: nvdimm@lists.linux.dev Cc: dan.j.williams@intel.com, vishal.l.verma@intel.com Subject: [ndctl PATCH] meson: fix modprobedatadir default value Date: Thu, 11 Aug 2022 19:36:53 -0500 Message-Id: <20220812003653.53992-1-miguel.bernal.marin@linux.intel.com> X-Mailer: git-send-email 2.37.1 Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The modprobedatadir is now set as a meson option, but without a default value. Set the default value if modprobedatadir is not set. Fixes: 524ad09d5eda ("meson: make modprobedatadir an option") Signed-off-by: Miguel Bernal Marin Reviewed-by: Dan Williams --- contrib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/meson.build b/contrib/meson.build index ad63a50..48aa7c0 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -26,6 +26,6 @@ endif modprobedatadir = get_option('modprobedatadir') if modprobedatadir == '' - modprobedatadir = get_option('modprobedatadir') + modprobedatadir = sysconfdir + '/modprobe.d/' endif install_data('nvdimm-security.conf', install_dir : modprobedatadir)