From nobody Thu Mar 09 13:09:31 2023 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 4PXTzb5Q6Kz3wvXN; Thu, 9 Mar 2023 13:09:31 +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 4PXTzb4wTKz3kc0; Thu, 9 Mar 2023 13:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678367371; 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=wyfESV1Ge2RbhN9xPUJPWnZo1ynSI1u23r0UQnVT8rQ=; b=OwG7YEONx4q/8s3dZrbmzQkuNsZz+5exx+lWcTXOmZFLyeGLv17ZERBpbktXv06oCwSGgS XCrHTj7slepigepbLjSOQXYiXOGtFFGJRlpt3mlAA4UlaB4TMJ/ZynWP8cVR1sOI+jKoVU Lq4yL9OdIx0pMEnZgkMDH1lWCgZ63JJA/tOTpJfWL+sgtGrypAHcXpu1fV0tvZZcz/4/VL 2i3+cEJo6dv3bqxM3VarBJvgI4snxnl0WHWMM3ZWzGrGmpTJbxRqybgnJ4q2y314qeN0MS FgidBtA1z7eNb7AkHjbTx3gv7SMRRUbw/PvJ0eI/0PgVgeVdV12ffpqtCCuCiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678367371; 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=wyfESV1Ge2RbhN9xPUJPWnZo1ynSI1u23r0UQnVT8rQ=; b=Pe0aLzGUpSVOxDQ8L878UZzcy1vZKULRAWAEC0WuXmDsw7YhxOyxtLZmjJbl5YOjCs2zJs Ovnh19/SEC2PmxhdHeSOxnqpSiCFe6MkFL1ydN2X921/sPx1xaTn7AFkSxNMZd2bio27Q4 GYYQfW65JtwwRaYYb0Ja4TpKJuhhh+qew+++/rqrTHjNGU0/R49xPiB2ow8s/T6M9bBmZ6 s2vju7KexWklD64sk4ud+7omoQ0frtLRN/eZqppB2eWJD4DXHQa1qf2iHTKVvktcZZaBSi r70W+ZW19n9IssbWirft3/P8lzuZ61Wp+yVDO0VoY6otqO0JbXWlIfVMdssNfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678367371; a=rsa-sha256; cv=none; b=eWtpQfxtPaDHfWxTh4wBF47m8s4n8SNcK0jfkSLZ+cpWXy+vDJa6c4GaGtYGlbtB62oqJS CjeoN1jEUs3vP0vi090aiAsF8DxXjldw/B2a3rQqXQmtrnJwgeQ6iIzJ5K55UNiz1IJqPg /DVRKJTb6yPU6Ne9O23ECUsQlTBTAXEX1yFtbxVle6bp3bXKenVjPSRAoBnJLU2aCagtVA OPw57RnYI6LRltXe16yZpJUHEjX6xxSqCC4UD9htJ6SPvf4pZ4Ggte6c96Tlv3BW5xoxRa G853HSUFLsmrPRBE7E5Mk1TNxliH9AQtOuav9zSujc09fWvokuG8Ii1SqwByUw== 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 4PXTzb40tTz17hb; Thu, 9 Mar 2023 13:09:31 +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 329D9VlW085872; Thu, 9 Mar 2023 13:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329D9VrX085871; Thu, 9 Mar 2023 13:09:31 GMT (envelope-from git) Date: Thu, 9 Mar 2023 13:09:31 GMT Message-Id: <202303091309.329D9VrX085871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 62679a0594dd - releng/13.2 - growfs_fstab startup script: set dumpdev to AUTO 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 62679a0594ddd71292894e1c02df23c696ee7801 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=62679a0594ddd71292894e1c02df23c696ee7801 commit 62679a0594ddd71292894e1c02df23c696ee7801 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-03-09 13:05:01 +0000 growfs_fstab startup script: set dumpdev to AUTO The growfs_fstab script has been testing dumpdev, and if it is AUTO, enables dumps on the newly-added swap device for the initial boot. However, dumpdev defaults to AUTO on main, but NO on stable/13 and release branches. On the other hand, bsdinstall adds dumpdev="AUTO" by default (controlled by a menu item). bsdinstall is not used when booting an SD card or other disk image. Adopt the default from bsdinstall, and set dumpdev to AUTO in /etc/rc.conf in the growfs_fstab script if a swap partition has been added, along with the explanatory comment added by bsdinstall. Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D38751 (cherry picked from commit eef9f9900f118b5efcabbd5864e7b8b993d09922) (cherry picked from commit 009abff336b6e83219178e7d87f6a91f54e31839) --- libexec/rc/rc.d/growfs_fstab | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libexec/rc/rc.d/growfs_fstab b/libexec/rc/rc.d/growfs_fstab index 8ad34f452ce0..c51f0dd6f3de 100755 --- a/libexec/rc/rc.d/growfs_fstab +++ b/libexec/rc/rc.d/growfs_fstab @@ -51,14 +51,9 @@ growfs_fstab_start() ' < /etc/fstab then printf "/dev/label/growfs_swap\tnone\t\tswap\tsw\t\t0\t0\n" >>/etc/fstab - - case "$dumpdev" in - [Aa][Uu][Tt][Oo]) - dumpon $dumpon_flags /dev/label/growfs_swap - ;; - *) - ;; - esac + printf '# Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable\n' >>/etc/rc.conf + printf 'dumpdev="AUTO"\n' >>/etc/rc.conf + dumpon $dumpon_flags /dev/label/growfs_swap fi fi }