From patchwork Tue Nov 26 15:47:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11262659 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 ED0461863 for ; Tue, 26 Nov 2019 15:47:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3CA520727 for ; Tue, 26 Nov 2019 15:47:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D2Iybter" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728642AbfKZPrX (ORCPT ); Tue, 26 Nov 2019 10:47:23 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35521 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728640AbfKZPrX (ORCPT ); Tue, 26 Nov 2019 10:47:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574783242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8glIoe+uaCE1EMr9+WlvtJO7cptuN17G6ARrJ+sD2OM=; b=D2IybterU3aw4bkB8D+Eqi822ZgjPgx/j/mz1S9AJzjiTU+IjnoPm67nIzrJ4zFk57lmJj cr7QmHd64lRbm2mOvuhmrKBOl8XigcvaYswOVUKIpJB5yrdQqZjTQ7WjlNfxbN6I5/wjpP BP6u1AO5uQt1j66zqOvgQ2Ri3izOw48= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-wOSuCoErMQ67e0Pm86zuTw-1; Tue, 26 Nov 2019 10:47:20 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CEB418B9FCC for ; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E0495D9CA; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id D920B20694; Tue, 26 Nov 2019 10:47:18 -0500 (EST) From: Scott Mayhew To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH 1/3] nfsdcld: don't override sbindir Date: Tue, 26 Nov 2019 10:47:16 -0500 Message-Id: <20191126154718.22645-2-smayhew@redhat.com> In-Reply-To: <20191126154718.22645-1-smayhew@redhat.com> References: <20191126154718.22645-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: wOSuCoErMQ67e0Pm86zuTw-1 X-Mimecast-Spam-Score: 0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org According to the guidelines in hier(7), nfsdcld should live in /usr/sbin and not /sbin. Plus, the nfsdcld.service systemd unit file is looking for it in /usr/sbin. Signed-off-by: Scott Mayhew --- utils/nfsdcld/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/nfsdcld/Makefile.am b/utils/nfsdcld/Makefile.am index 2c4e5a1..273d64f 100644 --- a/utils/nfsdcld/Makefile.am +++ b/utils/nfsdcld/Makefile.am @@ -1,9 +1,5 @@ ## Process this file with automake to produce Makefile.in -# These binaries go in /sbin (not /usr/sbin), and that cannot be -# overridden at config time. The kernel "knows" the /sbin name. -sbindir = /sbin - man8_MANS = nfsdcld.man EXTRA_DIST = $(man8_MANS) From patchwork Tue Nov 26 15:47:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11262661 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 97D4B13A4 for ; Tue, 26 Nov 2019 15:47:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7019120727 for ; Tue, 26 Nov 2019 15:47:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AJ7dFhR5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728640AbfKZPrX (ORCPT ); Tue, 26 Nov 2019 10:47:23 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21386 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728620AbfKZPrX (ORCPT ); Tue, 26 Nov 2019 10:47:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574783242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zx3+WHOqf+QPSHd0o58wVu48U2o0GqPsWDqk3svFzyE=; b=AJ7dFhR56TSCoBpEGcMzPY9zZRm0Y1nAD7P6wNdFkmm0fYoJh7P2MUWIY+ZBhjOsC0zS5r XDVIqkGhzdf2FUklIJxDFiVE/pfidmx3ptRLD1/LYZWuqZkXJNcHHeKbLeAOAR9qeF9+28 RF/+yAXn0+5sxSgtiaqRqIGnuxN0Nq0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-e81MP0fKMz-fISGmwxyEMA-1; Tue, 26 Nov 2019 10:47:20 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68D07DB3D for ; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C36E60BEC; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id E1C56207A3; Tue, 26 Nov 2019 10:47:18 -0500 (EST) From: Scott Mayhew To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH 2/3] systemd: install nfsdcld.service when nfsdcld is enabled Date: Tue, 26 Nov 2019 10:47:17 -0500 Message-Id: <20191126154718.22645-3-smayhew@redhat.com> In-Reply-To: <20191126154718.22645-1-smayhew@redhat.com> References: <20191126154718.22645-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: e81MP0fKMz-fISGmwxyEMA-1 X-Mimecast-Spam-Score: 0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Scott Mayhew --- systemd/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/systemd/Makefile.am b/systemd/Makefile.am index 590258a..75cdd9f 100644 --- a/systemd/Makefile.am +++ b/systemd/Makefile.am @@ -36,6 +36,11 @@ unit_files += \ endif endif +if CONFIG_NFSDCLD +unit_files += \ + nfsdcld.service +endif + man5_MANS = nfs.conf.man man7_MANS = nfs.systemd.man EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS) From patchwork Tue Nov 26 15:47:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11262657 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 8C2B617F0 for ; Tue, 26 Nov 2019 15:47:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64B3F2075C for ; Tue, 26 Nov 2019 15:47:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="WqPX4ml5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727533AbfKZPrW (ORCPT ); Tue, 26 Nov 2019 10:47:22 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38701 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728620AbfKZPrW (ORCPT ); Tue, 26 Nov 2019 10:47:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574783241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VRQrRgYBZsPKfq68KFpJ+l9WP997s45cG28WLAZ1K9Q=; b=WqPX4ml5PWg0snDYfItJ7h4dQr4a6u5G9/30HO4Xu5Y/Y/QXlyJfeKJyVGSzCVWRr2OZ4Q fUJP9FS7cW3pKjtdSEqyHO+EPjpIlE6s1J7mjGoSpO/iQ20Aiwk2q+NC5lPz6GUE7/6g24 UOfk7ODzEbNEXuL8xUrIrzGr1cSdhO4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-366-_ZK_r-7ZPkOqqwwc7ga8kQ-1; Tue, 26 Nov 2019 10:47:20 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6988E18B9FCB for ; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EBB31001281; Tue, 26 Nov 2019 15:47:19 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id E76A020844; Tue, 26 Nov 2019 10:47:18 -0500 (EST) From: Scott Mayhew To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH 3/3] nfsdcld: getopt_long() returns an int, not a char Date: Tue, 26 Nov 2019 10:47:18 -0500 Message-Id: <20191126154718.22645-4-smayhew@redhat.com> In-Reply-To: <20191126154718.22645-1-smayhew@redhat.com> References: <20191126154718.22645-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: _ZK_r-7ZPkOqqwwc7ga8kQ-1 X-Mimecast-Spam-Score: 0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This was causing nfsdcld to spit out a usage message instead of starting up on non-x86_64 arches. Signed-off-by: Scott Mayhew --- utils/nfsdcld/nfsdcld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 9297df5..2ad1001 100644 --- a/utils/nfsdcld/nfsdcld.c +++ b/utils/nfsdcld/nfsdcld.c @@ -737,7 +737,7 @@ out: int main(int argc, char **argv) { - char arg; + int arg; int rc = 0; bool foreground = false; char *progname;