From nobody Tue Jun 24 15:12:55 2025 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 4bRT3C62Ndz5yvBP; Tue, 24 Jun 2025 15:12:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRT3C41xGz3Tvc; Tue, 24 Jun 2025 15:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750777975; 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=qnqM0jO7OAlPiyGWZJHU2bRpFbeoEhdgsIKff5H6jgg=; b=hY2HwhMTABSuJWmjz6R5klwLWHVrlj+ho4M9rVbgxc1vr11gL+zQU96CBH2Ls43Oj9jPtC Go57alPsdzgGUD2Ylmqh5tLUy0WF4VeUka8X3VAlxtI47sOwpve5kdIfLnxIALJ+84O5/Z 4OVeGe9xOThzsIVCjtK7w3Gfhq4PP/N43L9Uej5tMs9Pyawn9b0/i1TSsuLR1To5aowcgE 7aNBZxzsJX/MDTWil6KT6F9T82m6rYyZRhNphg5I5HVf2j5F8rpmrLUm9eOGeIJnd9rzoH x4GxGA+8Ak4U444e53cgZ4gs/wIyo+Ma/5vIfUzx8Hsp4xr9wVH/HMcyP+nT4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750777975; 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=qnqM0jO7OAlPiyGWZJHU2bRpFbeoEhdgsIKff5H6jgg=; b=FKpPRizItwcR8vUjGdgUlREQ1ZQT51Fe30VUIaZ/JJXvr3/C71oJKzgOIj/syvdKwk9ocz TcWt/njyOq6EcI/C/VNuFaSbF/jdUlW8lD5svJE77+fhpw+3fhGub/b7VPx++B385x2EQW 8+TSJoVxP5976c4eJ22Sdc4AqI9K3pCDGLJukoJF621RZkH+SEh21K2sFhUNI0OtmB/3th OUVvkyjlsslAnrbWaXm+ejDiUOC4F5yKXpWqmxTnA+CcU4EDDYCSDC4U6uK2QocD3Kbgjt G9gqOhb8qUb249W53VUSEs/Fgzqwxu+uOWn1iL/pPsAFPYofE+leWECxklimVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750777975; a=rsa-sha256; cv=none; b=Jd5j7oAfPznYPlEfSgQf2Ld116wHsafk+t6G5/5AUPJuXBY8BIQdFYeZhP6f53qZH2Q/oL qd24koUkY19ZyPvyAPrFCjm5oTu5rQ1PdklNjODRUKt177/lgZeoDKBeGbDiFAMjw8BRFH Pk8BG6hdKHnjQVxeD80iUC0d0rkUdAJIxN8ccQoKeK38srNkvb462ObJnSKjhwj5Z1ExAn +0vKAe+8dURPhieqMa4gQThPsx+9+M8n5UkCgK2rNC+aAg6ie2odNO+UuvA2Ww0++kaNbR 5W0bd2x44vgEe85DpuT/6/inX7yjFb+23ZvW/fQpznVrW20PURNSOWcw4Gja0A== 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 4bRT3C3PfYzsnH; Tue, 24 Jun 2025 15:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55OFCtYQ028572; Tue, 24 Jun 2025 15:12:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55OFCtv0028569; Tue, 24 Jun 2025 15:12:55 GMT (envelope-from git) Date: Tue, 24 Jun 2025 15:12:55 GMT Message-Id: <202506241512.55OFCtv0028569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: ac7a19d41ee5 - main - lualoader: Add distinct brand for installer 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac7a19d41ee5eb1271c46fbc620b2f98dffa2230 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=ac7a19d41ee5eb1271c46fbc620b2f98dffa2230 commit ac7a19d41ee5eb1271c46fbc620b2f98dffa2230 Author: Joseph Mingrone AuthorDate: 2025-06-23 20:47:20 +0000 Commit: Joseph Mingrone CommitDate: 2025-06-24 15:11:15 +0000 lualoader: Add distinct brand for installer Make it obvious to users that the system is booting into the installer. Reviewed by: kevans, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51001 --- release/Makefile | 3 +++ stand/images/Makefile | 3 ++- stand/images/freebsd-install-brand-rev.png | Bin 0 -> 7724 bytes stand/lua/Makefile | 1 + stand/lua/gfx-install.lua | 24 ++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 5875a22a5bfd..d7721cf4ccd8 100644 --- a/release/Makefile +++ b/release/Makefile @@ -245,6 +245,7 @@ disc1: ${PKGBASE_REPO} 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_brand=\"install\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG @@ -284,6 +285,7 @@ bootonly: 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_brand=\"install\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG @@ -338,6 +340,7 @@ dvd: ${PKGBASE_REPO} echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf + echo loader_brand=\"install\" >> ${.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 diff --git a/stand/images/Makefile b/stand/images/Makefile index d1e7d124dfa6..2f45b989e0a7 100644 --- a/stand/images/Makefile +++ b/stand/images/Makefile @@ -1,6 +1,7 @@ .include -FILES+= freebsd-brand-rev.png freebsd-brand.png freebsd-logo-rev.png +FILES+= freebsd-brand-rev.png freebsd-brand.png freebsd-install-brand-rev.png \ + freebsd-logo-rev.png FILESDIR= /boot/images diff --git a/stand/images/freebsd-install-brand-rev.png b/stand/images/freebsd-install-brand-rev.png new file mode 100644 index 000000000000..59d173d3f8b3 Binary files /dev/null and b/stand/images/freebsd-install-brand-rev.png differ diff --git a/stand/lua/Makefile b/stand/lua/Makefile index 3cec7ae3b050..d319261e18b2 100644 --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -24,6 +24,7 @@ FILES= cli.lua \ gfx-beastie.lua \ gfx-beastiebw.lua \ gfx-fbsdbw.lua \ + gfx-install.lua \ gfx-orb.lua \ gfx-orbbw.lua \ menu.lua \ diff --git a/stand/lua/gfx-install.lua b/stand/lua/gfx-install.lua new file mode 100644 index 000000000000..d4cd34e32e1e --- /dev/null +++ b/stand/lua/gfx-install.lua @@ -0,0 +1,24 @@ +-- +-- Copyright (c) 2025 Joseph Mingrone +-- +-- SPDX-License-Identifier: BSD-2-Clause +-- + +return { + brand = { + ascii = { + image = { + " _____ ____ ____ ____ ___ _ _ _", + "| ___| __ ___ ___| __ ) ___|| _ \\ |_ _|_ __ ___| |_ __ _| | | ___ _ __", + "| |_ | '__/ _ \\/ _ \\ _ \\___ \\| | | | | || '_ \\/ __| __/ _` | | |/ _ \\ '__|", + "| _|| | | __/ __/ |_) |__) | |_| | | || | | \\__ \\ || (_| | | | __/ |", + "|_| |_| \\___|\\___|____/____/|____/ |___|_| |_|___/\\__\\__,_|_|_|\\___|_|", + }, + requires_color = false, + }, + fb = { + image = "/boot/images/freebsd-install-brand-rev.png", + width = 80, + }, + } +}