From patchwork Fri Nov 25 14:06:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 13055980 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A4A5C43217 for ; Fri, 25 Nov 2022 14:07:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229717AbiKYOHK (ORCPT ); Fri, 25 Nov 2022 09:07:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229601AbiKYOHK (ORCPT ); Fri, 25 Nov 2022 09:07:10 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF9201EAFA for ; Fri, 25 Nov 2022 06:07:08 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id ha10so10620053ejb.3 for ; Fri, 25 Nov 2022 06:07:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=A33yTDzifZAAnLHPVh6Tk9AoRA7BtVeBQ7dtOdMue8k=; b=E/RgLsdBCqscHHZhTRNuqdG1wmO6LSqRDJapzeK+JbFBY+fFyGaUASxs25Bdy8WsOq 9vGFhCeCymgos6JCyL2Jksn20hb82F4wg8YijjRtL/6XgIgCC3LubzLiP5N/a9xGvbsW iEtxXIKWwsXW7Isy6tz2CqCauQEpU6cskjzm4YRP7pH1/C6qsEL59+xmejqIavddQ+C/ FDu9WiY2f/U7VuSE8YdoVQKMLo64Z3tuL1sa0KPP0wItsu6Ylmf54SpFq3FfeOZFvewE Wn2GT82I2TMwV4t/z2dNLHm+QeMoJqT0ZcXVlNbmTpMQcB+Lo9hR/foh/ssUT1qrWJ0L Wcfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=A33yTDzifZAAnLHPVh6Tk9AoRA7BtVeBQ7dtOdMue8k=; b=f0GYjkj+4T9wbB62J/YGrfpLH/CmHhHSYzBjcGA46v9OzW863Q2b4PeX1Vxcu4DjIo mHuI8aY+pg8GcbnNowiM2EoHtfaowHkOdPRy8T+mcFr0OCHJBzYDMRqxJvcwHG06iC0L etZkf3vMbD4Z2T+ZgYJficF4fAzuWc3nhvfQjtzldnKuZ9zj2jaHN+X3zO7Q8EJIJdb/ 5Ro3Tm4Ue8g0aWY+WavMe3ZDMjelVBevD/URnzAJ4kvnGSF4CoqYd19rz2nP/DnES6ih oBLUvHsLjwxlBTRaYpwcMXAYTVCuAIOU30Ub9FmE442Eouk6p/vJf1NuYI2HYxlKPMMW LyBQ== X-Gm-Message-State: ANoB5pk5dACtcC/Yd1QY1AJf43dDRHZTpc94iVC+oaA1EE0erGjTtv1M 1vZsAEnAzUApd18EuhuBcn4+GEVE6re5YQ== X-Google-Smtp-Source: AA0mqf6UO7RMmqI2uMkQtTyXTyQt7RbjSNKA1Ba+jCjmO6zzs/I3+cJdCEYrgPDGKmWq2ryvyMi71w== X-Received: by 2002:a17:906:9f09:b0:7bc:db1b:206f with SMTP id fy9-20020a1709069f0900b007bcdb1b206fmr2131777ejc.719.1669385227282; Fri, 25 Nov 2022 06:07:07 -0800 (PST) Received: from eldamar.lan (c-82-192-242-114.customer.ggaweb.ch. [82.192.242.114]) by smtp.gmail.com with ESMTPSA id a4-20020aa7d744000000b004615f7495e0sm1821729eds.8.2022.11.25.06.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 06:07:06 -0800 (PST) Sender: Salvatore Bonaccorso Received: by eldamar.lan (Postfix, from userid 1000) id 0DF32BE2DE0; Fri, 25 Nov 2022 15:07:06 +0100 (CET) From: Salvatore Bonaccorso To: NeilBrown , Steve Dickson , linux-nfs@vger.kernel.org Cc: Andras Korn , Marco d'Itri , Michael Prokop , Salvatore Bonaccorso Subject: [PATCH v2 1/4] Revert "configure: make modprobe.d directory configurable." Date: Fri, 25 Nov 2022 15:06:53 +0100 Message-Id: <20221125140656.1985137-2-carnil@debian.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221125140656.1985137-1-carnil@debian.org> References: <20221125140656.1985137-1-carnil@debian.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This reverts commit 7d76dd2e6f09a141eb6303b7343baa5c4f9c85ad. This is part of the full revert of adding support via modprobe.d configuration to set sysctl settings of NFS-related modules when loading the modules. The approach caused problems with sysctl from busybox and with kmod as reported in Debian (https://bugs.debian.org/1024082). Signed-off-by: Salvatore Bonaccorso --- configure.ac | 12 ------------ systemd/Makefile.am | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 5d9cbf317453..4280cc770a45 100644 --- a/configure.ac +++ b/configure.ac @@ -71,18 +71,6 @@ AC_ARG_WITH(systemd, AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1]) AC_SUBST(unitdir) -modprobedir=/usr/lib/modprobe.d -AC_ARG_WITH(modprobedir, - [AS_HELP_STRING([--with-modprobedir@<:@=modprobe-dir-path@:>@],[install modprobe config files @<:@Default: /usr/lib/modprobe.d@:>@])], - if test "$withval" != "no" ; then - modprobedir=$withval - else - modprobedir= - fi - ) - AM_CONDITIONAL(INSTALL_MODPROBEDIR, [test -n "$modprobedir"]) - AC_SUBST(modprobedir) - AC_ARG_ENABLE(nfsv4, [AS_HELP_STRING([--disable-nfsv4],[disable support for NFSv4 @<:@default=no@:>@])], enable_nfsv4=$enableval, diff --git a/systemd/Makefile.am b/systemd/Makefile.am index 7b5ab84bd793..63a50bf2c07e 100644 --- a/systemd/Makefile.am +++ b/systemd/Makefile.am @@ -82,7 +82,5 @@ install-data-hook: $(unit_files) $(modprobe_files) else install-data-hook: $(modprobe_files) endif -if INSTALL_MODPROBEDIR - mkdir -p $(DESTDIR)$(modprobedir) - cp $(modprobe_files) $(DESTDIR)$(modprobedir) -endif + mkdir -p $(DESTDIR)/usr/lib/modprobe.d + cp $(modprobe_files) $(DESTDIR)/usr/lib/modprobe.d/