From nobody Fri Sep 02 19:36:32 2022 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 4MK7Sw2g7Zz4bXf1; Fri, 2 Sep 2022 19:36:32 +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 4MK7Sw28cxz3qyr; Fri, 2 Sep 2022 19:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662147392; 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=S11xf+IonfUz7OlPwUmda0VtE5EMe28/7t7DT2FSBeI=; b=FU5kAajw9C0suLPoFFWcCbZN4K7tWWCSBJdZJ6fR6QJLE/2UjoJIoDHFiZIzhFh7FNBxbA mGj4uhdv8pFbN5iiI4+Twloa3KxfBhcktQsqCl/yPqUBY0GJcuSB16EXo/CSzkkArQVKwV dwJzGLCgHmnSs+pdzVACRcsT/G/3ULEMuA8CWW8+bj89VxapV1SrLrPS473/7fOA2lr+i4 t7cPnYujzRsqr4ElgNPdNgLh9OfZFcEIJnK4r5jhdWOiobWu0x4OyM6iqXkkdklEpfDv/0 jcHl6P1dVIdOQReB54k3MEBqb1hyl+KEZJbihkeMjtXrpMw8FIhKv3uKEhXDnA== 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 4MK7Sw0y51zvR8; Fri, 2 Sep 2022 19:36:32 +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 282JaWSj067231; Fri, 2 Sep 2022 19:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 282JaWQx067230; Fri, 2 Sep 2022 19:36:32 GMT (envelope-from git) Date: Fri, 2 Sep 2022 19:36:32 GMT Message-Id: <202209021936.282JaWQx067230@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 2a90c47af158 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2a90c47af158625b3e28390801639c21d6d0ed2a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662147392; 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=S11xf+IonfUz7OlPwUmda0VtE5EMe28/7t7DT2FSBeI=; b=ClEGJM+u0qSd9apTi+lLAkN2MIKZP8L/ZsGILYhU1JfiIwatLELyQ/UdnucaeaUvnFIaUz J+dVudtTREytCDoy0K2alpef4X7dgqk+Y8wlHMCInXNkkYP/sN/fEMyl0wldbrOQzVlnFi SUefFNgX3/pTS+9sAv1MYIATPcZz+77gU/TsuicDSLfeT4/lYQ1wg4Mh3yO1LEKrP3xrKy tpjPWAM92KLISZmJ9nGbm157XRjUovbef6VfphSfG07bQpSabQNqdwnTviu1a3huRQlHrS MbLR10FrnwmdMG3nUOL9BwJTv7wW+uT/5g567TZvQa0mdO6WdQbZhBQGPhKMpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662147392; a=rsa-sha256; cv=none; b=ATXHyQ+AnPXH7a/5sJuACo+VRRcIFbSGDSTPQm5y8027VioyXvCYu81htVlkpUFnu5Y/n7 2dEg0zJYtXxF80EHloFrSp2wJcZARqL9kS39UhqC/GILTU1rMB8nr+jsIlmNZmpz1EaP9G x/am9pKH8Yea+scR8rFZSNdoQOiUtjayIeywzePmyHTRpm4MORea/YB5ibBmohCpTFuyTp AMJWIiLEYyCRWXd3uTdOPqw/GPkNXTozBGE9UoRkFYi5MmLClG9bL4PfIqP2g57nrNMrUZ yoCF4CyV6TGX36l38NGTFPQwsS/Hmam5sT+RPhKEMRn9UlOxgzqy27RmexaM4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2a90c47af158625b3e28390801639c21d6d0ed2a commit 2a90c47af158625b3e28390801639c21d6d0ed2a Author: Jessica Clarke AuthorDate: 2022-09-02 19:30:50 +0000 Commit: Jessica Clarke CommitDate: 2022-09-02 19:30:50 +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 --- release/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release/Makefile b/release/Makefile index 7aeca8cc0276..16fae5d74acb 100644 --- a/release/Makefile +++ b/release/Makefile @@ -187,6 +187,7 @@ disc1: packagesystem echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.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 .if defined(NO_ROOT) echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG @@ -222,6 +223,7 @@ bootonly: packagesystem echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.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 .if defined(NO_ROOT) echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG @@ -256,6 +258,7 @@ dvd: packagesystem echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.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 .if defined(NO_ROOT) echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG