From nobody Tue Feb 22 13:24:42 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9DA6719DE80D; Tue, 22 Feb 2022 13:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K30JW1BNLz4sh0; Tue, 22 Feb 2022 13:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645536283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/peIKWKenZNSgLMG9du3+P1GqHVvgb/S1fu73UT27hk=; b=lrxTuEMY9T9YZscWhdCdD2UXkV2t/uhHzEqIZkL20D5veo4LYYd8voYQBtDVvvXd/TnEbX N0GDpbzysGX4aXX+fvnozl5fVlbPinKVp9d7ilaSguFV7kBo0UtevY9ioJmg2sJfMF98pp IFwvtRP6iP2UYxMW0CgjW+eaj9n3623JUSZQ5Z18sHAs6xGchK983P9dkKXI+gQcrEu28Q tarWvO8PDril/V3DRfPodeLvVxGYo/y5sXWT062YEyNPw8kol/B51mJu2WO5HWM/jFD4/I z7v8LfSma+1V8OXFKsFUxrHkbejpLQAZru7pvMlDowFBXTJKzN3vlGbgSxTV4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1B4224CEA; Tue, 22 Feb 2022 13:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21MDOgcb000196; Tue, 22 Feb 2022 13:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MDOgXE000195; Tue, 22 Feb 2022 13:24:42 GMT (envelope-from git) Date: Tue, 22 Feb 2022 13:24:42 GMT Message-Id: <202202221324.21MDOgXE000195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 099b125337de - stable/13 - rc: improve dependencies for growfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 099b125337def5a3f94aad49c3cc32e583181153 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645536283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/peIKWKenZNSgLMG9du3+P1GqHVvgb/S1fu73UT27hk=; b=i4drOeGPRgS8pW5LTeEdquNZaPWvFP/cozUIhe/drVrQx0GRaprZCKooEWn8thkocNVMS0 YRtfyKwchNWHV5Qw2sarLm7xuTL9ZFfDSXUDaT41txwuWpCI7VRL9rVcpDuIvbkVgr9d9s R3RMgwN/U0RKFxfjLVv7LGL5IXn2dBAT6xRDMQMUWatqS9qs0gfvCGw1MgZFJI29hPUyq4 cp5wCOAruIlhdlBpsWOAEX4bVRrvYNBhVmfaqMKUOR4I9Z5Wvt5/uKhYcSAQbwrwrkVFX3 DjaLA+e+hWFda7tl0abBHRQC6ZDU5WChPIMUKZyBQqyYpNCzSKwdaU22RYUtwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645536283; a=rsa-sha256; cv=none; b=qnbcIL8ukwc0ey6M1AZJ4/DS4aqRmBDbLaFFejEwUXhOfH9jeLrX6ALpx298gmJiWC+Y0Z HKqt9Hih1YdsgfrXDv1HFoxpjitPO/xdKRzUAqNgnF2HBYBuYrrrox1WUj8S47Ww6pEJ53 WXgpLidmShRlpNpxadxGzqXJGptdZ1D25lTuPLYzVOrLLK/bgjgmRPyCY7hpgURGucJeKP usbtPSKZMd0NzGZD+he6wbA5JSceOHX2BSCQagBy2B9o4RRcgy84eu40qwkC9mfwrOJLAo M3t42zElApK8pU0ghO5ha+KFp5U1rAEeL2zIbOI8pJLjB1LQnncHzpagc4E4fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=099b125337def5a3f94aad49c3cc32e583181153 commit 099b125337def5a3f94aad49c3cc32e583181153 Author: Edward Tomasz Napierala AuthorDate: 2021-04-25 12:41:36 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-17 00:09:25 +0000 rc: improve dependencies for growfs Previously it depended on sysctl, which itself has no dependencies, so rcorder(8) had a bit too much flexibility when choosing when to run it. Make sure it runs just between 'fsck' and 'root'. Reviewed By: jmg, imp Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D29748 (cherry picked from commit b68e6569221ecade8899eaab8e1b088947ef2f8a) --- libexec/rc/rc.d/growfs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/growfs b/libexec/rc/rc.d/growfs index 54bab2a60dfb..c2955c740d43 100755 --- a/libexec/rc/rc.d/growfs +++ b/libexec/rc/rc.d/growfs @@ -28,15 +28,17 @@ # # PROVIDE: growfs -# BEFORE: sysctl +# REQUIRE: fsck +# BEFORE: root # KEYWORD: firstboot # This allows us to distribute an image # and have it work on essentially any size drive. -# -# TODO: Figure out where this should really be ordered. -# I suspect it should go just after fsck but before mountcritlocal. -# + +# Note that this uses awk(1), and thus will not work if /usr is on a separate +# filesystem. We need to run early, because there might be not enough free +# space on rootfs for the boot to succeed, and on images we ship - which are +# the primary purpose of this script - there is no separate /usr anyway. . /etc/rc.subr