Received: by 2002:ab2:6203:0:b0:1f5:f2ab:c469 with SMTP id o3csp3071957lqt; Tue, 23 Apr 2024 09:32:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXJlIpPYCJ9xhjJv7lYlvnzjLBywap/aVtDDaPv7IG5pbxJW+n+QATULpyl8752G8ZwSBVKYBGCeqE69VD/NGC2fVJfkQR4vJp+UEwChw== X-Google-Smtp-Source: AGHT+IFD8pg+IqbjM4/UOGFjtIuNzG08TS+kAsgSJGF5mQkqVFsE/QZwrBLxcEBmFNk6U7Yc9JaF X-Received: by 2002:a17:907:3209:b0:a55:b2f4:908b with SMTP id xg9-20020a170907320900b00a55b2f4908bmr6224312ejb.18.1713889940671; Tue, 23 Apr 2024 09:32:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713889940; cv=pass; d=google.com; s=arc-20160816; b=mlc3gwGpCTIRsxeLp+3idl0gKBz4Q8gESKYfjJz3EqRjhJ2E0Qm3t59wTGGRxFqrBs DtSbPndce8gcjguZMPVzkXGr+yW5mHi5SdSrmGFlYATddyphm4U8HJvMwO6G62R1Idoy +sBgNknFczfW1Jl03C1Ie+IvOFAYcV/YbuA62YCNefXZ4JJedmbaR9HWz89qPOJ0q2RE niZZXBAKn3PAgBT5z1SJJGkSta70umMOD7VZITFqe4RaTlmLImKCTUGFpqJALmlJlCil bqy2QMo/tx09cq9WoP20EVDpCUp8Sh18nb+uO77LbsaA5DavHF1v5vClCDNbCjK16Wfj BJxw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=pUi3BLoytn39P7V/fhKadIaxnR8M1aqXHC5B7mYTWQo=; fh=/OWPPlFN6TE0QWnyruJXfIhTSqzujodC9vFPVG69zww=; b=fIr06ZJO0A737ntpQcVgu2X2T+0i74MJCA4WOkC9pkS8i2rXoTZJ58461zX/DnZdUl W7H0rRcdtdx88way7/Xopt1ZglnUzlUbmw6UXoHYM/gT2ahWSqGV8D+NW8nO6kS0443g tEKmvktks7q+9ZYUIjx4vbcFoxI+q7sPGFHk1nx2QFY6tLV/0RZm/DT19U1+SbQew8Kb qJeajArj26ZWo27EUCXeYu1zPKRt7S5czqWWU5A/9Nk3b4wqFVHKNFC2VZEnLDtcAPRO agHS8xwjnOFYBDAei0z2U+T0G02/8MXyVX6aR7jcATGU/Q12HBdIRGfBsIdWQAq21CmZ 8i0g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XYIPOgo0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-nfs+bounces-2963-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2963-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e8-20020a170906248800b00a5881f27f4bsi784723ejb.297.2024.04.23.09.32.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 09:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs+bounces-2963-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XYIPOgo0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-nfs+bounces-2963-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-nfs+bounces-2963-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9C0141F23E14 for ; Tue, 23 Apr 2024 16:32:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 800AC13CFBE; Tue, 23 Apr 2024 16:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XYIPOgo0" X-Original-To: linux-nfs@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5B7B413C3E3 for ; Tue, 23 Apr 2024 16:32:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713889923; cv=none; b=lq7kphXMIGUh239tCCckj5Md0Kn6C1ILaKvbrbkeXwvC2LgtjlzXNdr4od/Sjj0jn8ng75E6wnn5ixVKHhi9BNy51aO3LFsetKOx06u18KjVzof7sJJHWiZL8Qs2i33whvddeD/TJ3JwrJeC1iQbUHsgbvDn/RxqFTLYm5M2Q9I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713889923; c=relaxed/simple; bh=9TFJBIp1pcmU93Uwfru2PyRm2ybd79FOSpQ0vTq+ap0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=liXv+fbtEAO7YMOCD0jSo5vTWgRzIWft31ZoA04YpIDcvY4xBkHiet/tbp1NAU+Exlf2gRnCMfbRNQ6oWxmgGLyqhX+ntsrzOz3gRpHs71MqCbUSPd7W6CRk9wBuhagREAhxz4xKvofpRcKWiyFTDf2Eb54mGKdOIielGhc2ru0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XYIPOgo0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7682DC2BD11; Tue, 23 Apr 2024 16:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713889923; bh=9TFJBIp1pcmU93Uwfru2PyRm2ybd79FOSpQ0vTq+ap0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XYIPOgo0LjnPWmxgNUokvuvkngW2UtwLcqKYJRd3UjIGDnP59xpCknT6Ng1pv5zQ2 PQDOfE/CxePP3bjYv+jlVMzRZzjKGJ/Z3NEpKGq72E2b8BAHl+EU5f+IeMSFZYKR/s 6AsXK+I7/eMAmbtsVzJlvpAaMfeg88s4/Kf1EL/OYly05kBSszW/jaWHiCxFplKWvL STRcqUlVtbxpuzDBWcwcilxH3/Z3tgY8IOakcXf/erwHFBWsNptLTrSVFjPZkBmX5h /+ekO6POd0OThHmFKPDD34nMMwIE+7qyKPpn7uUGq5IVmTFOGPI4Yy0z8FLOu2zFIT eOZjlac0ceh7A== From: Jeff Layton Date: Tue, 23 Apr 2024 12:31:55 -0400 Subject: [PATCH nfs-utils v3 3/3] systemd: use nfsdctl to start and stop the nfs server Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240423-nfsdctl-v3-3-9e68181c846d@kernel.org> References: <20240423-nfsdctl-v3-0-9e68181c846d@kernel.org> In-Reply-To: <20240423-nfsdctl-v3-0-9e68181c846d@kernel.org> To: Steve Dickson , Lorenzo Bianconi , Chuck Lever , Neil Brown Cc: linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=906; i=jlayton@kernel.org; h=from:subject:message-id; bh=9TFJBIp1pcmU93Uwfru2PyRm2ybd79FOSpQ0vTq+ap0=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBmJ+J/K7ZY904geoTO+eOGp3yEBLMzIuR4w2hAw QOqu8rVVwKJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZififwAKCRAADmhBGVaC FUDiD/0d01SvixTBBczpSADE1OEd1emYxoQYfjdPiGEUere5l5yVy2btITj/5jltCu+ZD3VvA20 BDduXVfyPHoUoQB4VAjtIO8hT9jtBAhAom/c5SzGphVDToNEkdi+Fo4XloK/lxsRSUVh6+KCcZU vzyI+CBOQDNGPx2XxY1XUpSQpyxwkIpXAt9aGHKUFhnyGWDSHAocu4x91pzv6HjwqeQTs83mQKh M60ORZXfG/y24PpTYFvFD4WH1cr0O2cwuBuS82hrg5pEi4mE5zRVlW+eIDNn5RcNOJN3xTzFcF8 UxsO9eFj5aawM2+utF0Xwvz01/KfPNkQoUc+qNZ0vygm5AGHZ6rlwz1+UUzsBAf/n8mtdGU5odH bMh67LuR2XyXM5Jrmw9AquAZvs8oVgzViY59wgMGuHI87ygimXahE4Amwmek9epT9P3/GwXvfH4 D4ogspu235pRQ0B/GSqc0KOsFcMM1Rnwyut1h4TYrR0y3XkXMQdqiBr0Lucf6dDwtO8v+9foe6U VO1q1KH/7sVr8x7FfEfMtXwf0cpi0UAg+KzauENg+EANgftlWo4LKxv1StqdUKmsmcRyZkRMHQX 2dRnDf0toXyCILOS0MOqvmYQIba10h1GaJb266oHINJM/aLgJrNylCOGhD5L0E4ut30fxc6gzZp FNkjDQv/+lrcF+A== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Attempt to use nfsdctl to start and stop the nfs-server. If that fails for any reason, use rpc.nfsd to do it instead. Signed-off-by: Jeff Layton --- systemd/nfs-server.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service index ac17d5286d3b..8793856aa707 100644 --- a/systemd/nfs-server.service +++ b/systemd/nfs-server.service @@ -23,8 +23,8 @@ After=rpc-gssd.service gssproxy.service rpc-svcgssd.service Type=oneshot RemainAfterExit=yes ExecStartPre=-/usr/sbin/exportfs -r -ExecStart=/usr/sbin/rpc.nfsd -ExecStop=/usr/sbin/rpc.nfsd 0 +ExecStart=/bin/sh -c '/usr/sbin/nfsdctl autostart || /usr/sbin/rpc.nfsd' +ExecStop=/bin/sh -c '/usr/sbin/nfsdctl threads 0 || /usr/sbin/rpc.nfsd 0' ExecStopPost=/usr/sbin/exportfs -au ExecStopPost=/usr/sbin/exportfs -f -- 2.44.0