From nobody Tue Aug 01 21:06:43 2023 X-Original-To: dev-commits-src-all@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 4RFnjR2Y09z4prf3; Tue, 1 Aug 2023 21:06: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 4RFnjH5d7zz3Lfl; Tue, 1 Aug 2023 21:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924003; 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=zKS0GAYHY7f9PuTOXQ/ZwS2iXGKMd2f5f9TacuSj/Xo=; b=p2TTUJkzLJ6iy0NYjP4lk9ByuAvy2k4kIqMsASgOiOY/XxC9R0RXQ95x0wDDBENLjLjeoV 5RTsu+Y5Rwn2LArUlLCbB7qSnHUsMiIo1q7tDwdxJ18sEPIHN2hf2lm/BI02frGCbrCF1F UKsMlnX0FOhanN1QR4IFV6VjwbWyrtyZJz39BFpml69yCSRQENRxzrn/Ug0kuhY+Qj65NL fJ1LGUJkfTjve3MvUdvLbnL/smlqa0EB4WtEyGuj5VWKbh6/iw+1ffAUtph6yCLRa798y+ PsWdb2fAe6LvK/8/WA5Cfyhsnqk+FpncphN46EA7GJuNDqpy/2TEbW1oc75SbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924003; a=rsa-sha256; cv=none; b=JmLZfe2XCGtXkltH2M1fghS72Rpg3tVxwZiz9lUjnDKgq/sAayeucwWYXuHE/nakax/dL0 jn7MxXCOVen55O8lT4QtabZ3uA2fvIVMxjOrY8nBu6/gKbdir6DHZUeii0sY/KrTh0PD90 a8KESrKTz3JEK/u746KD4xoKsDDQ0QZ6FH47ucGyOPayLUfY3vbdd0cxNXAjIyzlJMCqf6 uQp6OXRrGzdNY7H7EjIgRX4EB3oHu3/mL+l+/0O84WzSvdaLT8WLhOznQsA/dtq7MbQHdR cBW054UrEtCQmSIAYsvwiiE1IejUKmkcHZA5mi3Kul+zpOzW3mxQxYZo63yxxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924003; 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=zKS0GAYHY7f9PuTOXQ/ZwS2iXGKMd2f5f9TacuSj/Xo=; b=v5hJvwo4ZLhdpBISSktGUGq6aBM69sa161URj+6nu09a2jzjQkUR8WHOYTP87tX65qYPxR YJf8eZRXKEDpaBVyfRys6T4Bdb7N6Xy70mbnAveWb74anAYjs6LtWbNP/hid5fgf+W1oGv d3tnkO/EraAef4wmCNpO650VWc8AOsk+uhtCERV/yJtoTVrnAZwsbVATmtKXImG/uPAkL9 FN+pvaorfnAgA80O+VXtbD/A4FVJjwPo5MXyBmzqoHbT/XMaCebyJq4yVC7osz/QEH4kHc heeGp2dvhWrG3K13THNNmLc9PegoUyO7BNGXFfRqzPqqDLad5LyfXnP/65rrhw== 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 4RFnjH2qgTzsRR; Tue, 1 Aug 2023 21:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 371L6hJY013760; Tue, 1 Aug 2023 21:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6hs7013759; Tue, 1 Aug 2023 21:06:43 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:43 GMT Message-Id: <202308012106.371L6hs7013759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2999e5315171 - stable/13 - release: Set loader_menu_multi_user_prompt to "Installer" for installer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2999e531517147d5bbe817d3945a6f1f51ff753f Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2999e531517147d5bbe817d3945a6f1f51ff753f commit 2999e531517147d5bbe817d3945a6f1f51ff753f Author: Jessica Clarke AuthorDate: 2022-09-02 19:30:50 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:52 +0000 release: Set loader_menu_multi_user_prompt to "Installer" for installer This makes it more obvious that the media being booted is an installer rather than an installed system, which is otherwise hard to distinguish. It also provides a more user-friendly, and more accurate, prompt. Reviewed by: gjb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36419 (cherry picked from commit 2a90c47af158625b3e28390801639c21d6d0ed2a) --- release/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile b/release/Makefile index 1288f750441a..33616a1e0ad6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -170,6 +170,7 @@ disc1: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET} @@ -193,6 +194,7 @@ bootonly: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc dvd: packagesystem @@ -213,6 +215,7 @@ dvd: packagesystem echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf + echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc touch ${.TARGET}