From nobody Tue Feb 28 13:56:15 2023 X-Original-To: dev-commits-src-main@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 4PQzRh1C36z3vV3k; Tue, 28 Feb 2023 13:56:16 +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 4PQzRg3wVLz4HCh; Tue, 28 Feb 2023 13:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592575; 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=dKUQeDKgXTPlbDWXpnevkbKHc7v1C6RuhK5XJkJNCxo=; b=jISmlCsy4WbLLlQS00PajCNUKSMqAffHAw07ySr3BR3THp4u1ZqYR4T2mUCDDEH/XdxYKT 3CSHNn2Zf+pt95kdl+QtLswgfJNXn6/Ej/TvrnehhMamG1hLqrC/vZkJOlQTVPO2nnATTS uBirGJOP2zZWvWEOO5spMMdaUBWxl2JnzCqmm+1U317qgVVqEbu4AQQLiL+Z1P1EQ2aZir 1ADr7qXSBzpCfiaFLHlL2L5osCB83wgA+xx37GFpdSSQkrZ3fKCxt97ybtZwPilpUHzlXI xhuheXHmj9oTnE2AND3aCoEgObJzomO2DR1rsEcW2oeJ1rPArUmXQONU4hCLhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677592575; 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=dKUQeDKgXTPlbDWXpnevkbKHc7v1C6RuhK5XJkJNCxo=; b=TQFOl0oi4BAXXSJ/9QdGPeGNga5d6gbVxhzju05HFzlGO5lCcH4aSmLRQFmXKrfrxqirHa GQdR6ysbdvgxlr5WeiO3ksS4sccfBAgP+9OKbP3GZ9PW3SuDtFYVdC/qw6FnmItJJAHtqU Ek72m/hjnowCRdT01ncMZ8n3DwC/qdJ14sflnKCi3gG1WHFtbCSu5JY48npgNZG5Z7xogR QwF5wIl36S4wfpKWYToRuoi4EByQOqyaMNfWrFQwrvUbc+EH7q52rxp1N9NXw/HFbr59nY DywuyGpZglcrtx5TmEH6Qw39PdN+DogLCXE96tTMFvy6GqNPKFD5xHb00F3rZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677592575; a=rsa-sha256; cv=none; b=tfyMXejMlcu9dt2db8lKc/DUqBX7kqPcKkgziSwDruEUUsKcgejtoWtia2sWoC9o7xhpAs dOvxyjUci8i2X7l4rjIqSHH3rLmSi8pTfcgNQq7QjA/5VLUzwrxW3XvwWL6p6A7nadQnFb fUK0xwjTZtDOVKaUBZ2RfuolcyO1UC5TzCmL3I5Ane5CTFBZhGDXxNAp8S6lH57labsira 8qjO1mL4hiZXuOuipZedjfDnyHFHAQvmoylyJg/whSvjPoyPjV1bNN5KwXO34YoJlulLbH n0LiPMJyakcvH1BLSWQxqDGeloSQH7CN7Hf0F2JKvriKf5aU66ao11lguhOgYw== 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 4PQzRg2zDSz18j3; Tue, 28 Feb 2023 13:56:15 +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 31SDuFIL073487; Tue, 28 Feb 2023 13:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDuFTV073486; Tue, 28 Feb 2023 13:56:15 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:56:15 GMT Message-Id: <202302281356.31SDuFTV073486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: eef9f9900f11 - main - growfs_fstab startup script: set dumpdev to AUTO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: eef9f9900f118b5efcabbd5864e7b8b993d09922 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=eef9f9900f118b5efcabbd5864e7b8b993d09922 commit eef9f9900f118b5efcabbd5864e7b8b993d09922 Author: Mike Karels AuthorDate: 2023-02-28 13:55:35 +0000 Commit: Mike Karels CommitDate: 2023-02-28 13:55:35 +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 --- 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 }