From nobody Sat Mar 4 14:58:57 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 4PTSf975Kcz3w6d9; Sat, 4 Mar 2023 14:58:57 +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 4PTSf96ZS0z3Hsy; Sat, 4 Mar 2023 14:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677941937; 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=kmvm3jeebJLtYftFvKxB9ISqnElf5kqYcqo/W0YNUIg=; b=ukJU58BBqZsxX19zrAAeXFCYJ7iNBDPJRb5UHOeW8uOoXHbrdFeRd5JD1UX/1z0FXU9ZAB dEzsvyTvvSYPqp7PDWTjijjnWo7HsPr69/OixeaFXwZ/IxwiZ6d3Q8iIq+rOQ5sY9M8BQg oEF24edFc7rO9v+ZwqahFn3uzKy+P+Z5KikGZfTpCUqNBNearbHAOH6k1C4OzetI/qMUQr 692MCeuf/8xvvZlUmlhdPvNVj5JGaEO70bQHcvea0CqUJXrd8/jlXw8CGuleVi+xpCf2RF +p8nyIjX/RsBfSJNvnlBj8KDsL7MVfLX5YAgbt0Czzj5X0GdhxSHKSTnp+uNEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677941937; 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=kmvm3jeebJLtYftFvKxB9ISqnElf5kqYcqo/W0YNUIg=; b=ZqYqsoIQDs48+uXZsbf15dIQgRFnRky2I6orFe9G79+CAeIq06PJuFIGKb5f1lu8vyEvAT Tb33vUGXrARpLMvBQhyCqEoxzrhNCY05mck+ElyiS887p5d0BauxzBTK9WoG6f/7mQ7aU+ mq4HR18v1kUbdqXksD1HV+PQqbdR7gfn5osrdZqTCMH1a5tMlqALE6nxCvk9WbSZPjyo7j 7Pjjn+i6gQ/R3CsJVjD4ITnbkZ4CVg5XpbMZOLzTBJrEzcibFu53IyRc4jJ71U6vcf8w6g r3daJ/TRpfePN70J2lQmoP9svSi5m9YcDMWINtg+cTnwXx1jummamu1PQUGjeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677941937; a=rsa-sha256; cv=none; b=c5pke6tfcpMyMVhAxLRNVznU2PsU/ne/ION1aIVKWOm9sC5m6uIknhKjpn9mnoAf1yMipB DR5eHxcWbXPafsRZ9l5UOciZwIb5qN7q7JrfSWcqe0USjoxEvTgVntkO1Z71dx0hAAxBx+ 7/knfyBJ3xQ+13iESU8X4aFhfCiMvntTgDZtktss+3u408f63TKcu0bv+l+PCpA7QjhIFh rGE1gTS+MPiqb9cwA+BcN6Bn+DqNuMabRMlY5nIyDWx9qnQtnKl7zCkFMctscDZRwJmglJ vCqhmveL0zSVNDmMUlh6ldK1qjCWnV2xq3s/w9/3xQoSJCtn265fIxghZMYusw== 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 4PTSf95cXXzkdK; Sat, 4 Mar 2023 14:58:57 +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 324Ewvjs037245; Sat, 4 Mar 2023 14:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324EwveO037244; Sat, 4 Mar 2023 14:58:57 GMT (envelope-from git) Date: Sat, 4 Mar 2023 14:58:57 GMT Message-Id: <202303041458.324EwveO037244@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: 009abff336b6 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 009abff336b6e83219178e7d87f6a91f54e31839 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=009abff336b6e83219178e7d87f6a91f54e31839 commit 009abff336b6e83219178e7d87f6a91f54e31839 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-03-04 14:58:41 +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. Differential Revision: https://reviews.freebsd.org/D38751 (cherry picked from commit eef9f9900f118b5efcabbd5864e7b8b993d09922) --- 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 }