From patchwork Sun Jun 28 19:10:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 11630303 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 05BAC138C for ; Sun, 28 Jun 2020 19:10:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEEE420702 for ; Sun, 28 Jun 2020 19:10:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wu6NMC5z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726685AbgF1TKM (ORCPT ); Sun, 28 Jun 2020 15:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbgF1TKL (ORCPT ); Sun, 28 Jun 2020 15:10:11 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5E41C03E979 for ; Sun, 28 Jun 2020 12:10:11 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id a8so9866135edy.1 for ; Sun, 28 Jun 2020 12:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gz7fBPj7kNNcPB3HynIk2m4+/WFTV+wONRiqrAQYTkc=; b=Wu6NMC5z1OCIjmHwxmu0cDgNC5uVqpZpCKOtCpuTPh7bw5XKYjvPV2Cz8VXksNi5Eh XP/AYC1oq6EEjJPifVAUrdJsuflP21ooRplKoFlsLTIQLhfUbfrOEr8YjAdE/w+y3PTz gvbAGKLMvZsooRrYDidesxMZqX53RW6w59DgmzcgMafHmVU69B90BfrqwW/x6GaAYhAk OaErLBgep/5AQnAODdDAkjKwOcc4oqAATeGyLlLg/hvWmayPCdU4VDet/n03nFGC17qV L8287XY2sIYO7NaQ7GKgQogeld163kBZgSuV8Lbcf6pWo0oofdNK0Xn+jFg5dWogB1Ld ZRWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Gz7fBPj7kNNcPB3HynIk2m4+/WFTV+wONRiqrAQYTkc=; b=YsAqa2VRl453dNH9AyLUn2wFIsOMXcoCLH+gq/c0zsBRQWKEFMdN9AxyM2kTva+Kfk CZHx/S1Uo66E1EkaBMVFl3ttHVsHbDjL0G07L4hiGt4OXyvxpfjmiZj6LcejDKb1DJXQ p4Bs12xUnn4pMYwjiwBhLXTUq4HFOl5QMlxsLxRs7s0DYg0xAo5ooO84A7lFblZzajo7 /tpNlwnWUmjbFiQn3z/kzL8rZEe9mqcXMbB4zliJi6KQ2xP6Gm7c0zrADYxuX4Tqe28z qY8Aavz2xB7REX3CrkR5Ag/rkp4VR4P2XGBwMkjP0poRVSIf+mY7N+TGeeymYoN1ezFy fLrQ== X-Gm-Message-State: AOAM530oO/D9vWz0JLI3xOcC9udonAeAhnuiL+Y7NLHm+uxNDcGNJbwZ swBHaKlzCwD8KQeujM6oHQ0= X-Google-Smtp-Source: ABdhPJywKbcnpyEny28Z/pB+tnW6sJFsoEaDWabDjoXHK0LuW6iSY2M2wJF3E7dRJUxma6WA+pFcsQ== X-Received: by 2002:a50:cd1e:: with SMTP id z30mr13718401edi.364.1593371410488; Sun, 28 Jun 2020 12:10:10 -0700 (PDT) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id w3sm23144429ejn.87.2020.06.28.12.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:10:09 -0700 (PDT) From: Salvatore Bonaccorso To: linux-nfs@vger.kernel.org Cc: NeilBrown , Scott Mayhew , Steve Dickson , Salvatore Bonaccorso Subject: [PATCH 1/2] systemd/Makefile: Drop exlicit setting of unit_dir Date: Sun, 28 Jun 2020 21:10:01 +0200 Message-Id: <20200628191002.136918-2-carnil@debian.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628191002.136918-1-carnil@debian.org> References: <20200628191002.136918-1-carnil@debian.org> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The used variable is named unitdir in configure.ac and systemd/Makefile.am otherwise but is used in a single place as unit_dir. The setting has no effect, but if later commits would use a base to the systemd unit files directory for installing further files this would void the possibility to explicitly set a systemd unit files directory via configure with --with-systemd=unit-dir-path. Fixes: 0fbf91a4fd90 ("Include systemd unit files in "dist" and "install".") Signed-off-by: Salvatore Bonaccorso --- systemd/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/systemd/Makefile.am b/systemd/Makefile.am index 75cdd9f54c81..f089c8831902 100644 --- a/systemd/Makefile.am +++ b/systemd/Makefile.am @@ -45,7 +45,6 @@ man5_MANS = nfs.conf.man man7_MANS = nfs.systemd.man EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS) -unit_dir = /usr/lib/systemd/system generator_dir = /usr/lib/systemd/system-generators EXTRA_PROGRAMS = nfs-server-generator rpc-pipefs-generator From patchwork Sun Jun 28 19:10:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 11630305 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 455C2913 for ; Sun, 28 Jun 2020 19:10:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2ED31206E9 for ; Sun, 28 Jun 2020 19:10:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FqfI382r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbgF1TKP (ORCPT ); Sun, 28 Jun 2020 15:10:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbgF1TKP (ORCPT ); Sun, 28 Jun 2020 15:10:15 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20F21C03E979 for ; Sun, 28 Jun 2020 12:10:15 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id rk21so14486790ejb.2 for ; Sun, 28 Jun 2020 12:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8903YLQ1rIwqRAQbysd9VVqtW87VpYeZxwAfqymplTs=; b=FqfI382rJ8+TyBAZmaI8Umm8MUhLXjEGoeNyzaGiBAiXBoePy+skDUs7QUtwRzkWwf uR+kxpFnXnvMq0uuh6EkdAd6JG/l233bIMZq9lUlPhDL9TPH3rSVU7lGucZpgmPoUseu 7Deu4eg4dGSboFXecn7SK9YvJxTgyX0ZlmqXOPGtia1qtrbz+ksaAnh4nuPgGpuK/MxX kZYLxXam3eIvA7+VGBsE/4ZIzf88Wc8CKUHjHjAzXBTFBJah3vOmvecUn9xX6jny1TFp 0405SuqI8OuEbpJNoj/32IZIcIKViF1tPrsMH4F0fLmeiCg2lBWT7LptNg1/4ocMjKsZ 8+2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8903YLQ1rIwqRAQbysd9VVqtW87VpYeZxwAfqymplTs=; b=VVWb6qQbyVI0z3ywh1uCjL/YPFAAaCbszNYDAPLmMqQg2HdBmuSZUJPiIa6EQ2ZkLg R3KMx+2o6jTkoNwBhEtfkoWJPzm0WCOsA/Zz0M6VcAYwyvprmA2dMtm2Zkxda+sIy/4u OIAIvdoufpQovhzHzEfPWw2OZ6fcLM7Gyr5ywrbkTQ+7luZCktvwAh4RU11beSjOBaOV XSMwpBQGy/kpLNtsu0uYG9aopYgndJvyMGml55Hvw94G0CaoY0po6030QUbPoQ9oeGu8 CknIecZ3J03rjKaZUZ11+2Zm/ZRkXizEF/96rc4T8apIAhv2D2/vB4Rnf5pThIqQF0Nx Npvg== X-Gm-Message-State: AOAM530JKZsX1ZiUr7POoDu8P1ZLfCttMX99MCJPVB2ulcqz2W814APV CAMDYngq5/kNV/TeX9PToQI= X-Google-Smtp-Source: ABdhPJxHvwrdBg5hNDpm3fQolYjua5jJEydNhiFy3rFW8fNsaPBUEH69NxahQnPSVoZIaBUwcf+FSQ== X-Received: by 2002:a17:906:50b:: with SMTP id j11mr10871186eja.127.1593371413858; Sun, 28 Jun 2020 12:10:13 -0700 (PDT) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id j24sm1090102edp.22.2020.06.28.12.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2020 12:10:12 -0700 (PDT) From: Salvatore Bonaccorso To: linux-nfs@vger.kernel.org Cc: NeilBrown , Scott Mayhew , Steve Dickson , Salvatore Bonaccorso Subject: [PATCH 2/2] systemd generators: Install depending on location for systemd unit files Date: Sun, 28 Jun 2020 21:10:02 +0200 Message-Id: <20200628191002.136918-3-carnil@debian.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200628191002.136918-1-carnil@debian.org> References: <20200628191002.136918-1-carnil@debian.org> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org While it is possible to configure the systemd unit files directory on configure time with --with-systemd=unit-dir-path, this path is not taken into account for installing the systemd unit generators, as they are installed unconditionally in /usr/lib/systemd/system-generators. Signed-off-by: Salvatore Bonaccorso --- systemd/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/Makefile.am b/systemd/Makefile.am index f089c8831902..9ee4f1c8f967 100644 --- a/systemd/Makefile.am +++ b/systemd/Makefile.am @@ -45,7 +45,7 @@ man5_MANS = nfs.conf.man man7_MANS = nfs.systemd.man EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS) -generator_dir = /usr/lib/systemd/system-generators +generator_dir = $(unitdir)/../system-generators EXTRA_PROGRAMS = nfs-server-generator rpc-pipefs-generator genexecdir = $(generator_dir)