From nobody Wed Jan 28 01:05:30 2026 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 4f13wp4yykz6PsFs for ; Wed, 28 Jan 2026 01:05:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f13wp2v65z3dr5 for ; Wed, 28 Jan 2026 01:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769562330; 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=QyX9EeBg2N3fVlyXYTEPJMWEJWRjLMSa7xIFw5GcJcQ=; b=R5OnIbUv2FiL+4hNu2LfwR+l6BK9tCxpQe0YqTiAyqp50pKMrFzT8xmFJr19J1Fd5SS6Iv vXCVcdGpiQLEwo3LaCoSvTFn2e97qYCr3SsxV1bXI2pQlILLM1lQQ1byEGUfdFpjk7KQtp V8jnKNAubzfs2ewr7SynYWjWHw2Dv50j8b8Xk8CIwbMRpQkJlHbcil0FgXejxpKcNdTjYG ue4yEFFTFdy1wFPGL/HyqInKYj9ZpgkuRHNmb492RZXGzyt9hzXi2rNG0yVMhlCu4hpNQD sBzv6Da/LitQ3HJBNNQ/lR6SeoZRxVmGZFtgs7WbAWUtocLQIt/Tw5/L6vofOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769562330; 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=QyX9EeBg2N3fVlyXYTEPJMWEJWRjLMSa7xIFw5GcJcQ=; b=adsqAtMlPWoz/OtTY8zu2w5VtS3obWLfsOy8+06vbHuNGA/Wey1ZmMQK7YYi+lTtUgnwK5 P1LZBQM9WWVPbxCtTlYjc1YDatYHkGQg4QGka5zKZUt5mSYj43p/cBVVnvnA3THs5oqZ8A XJx+qb8iQ/6vA24ZNjvTSUBMW8CpW+RMJQdq218ZRnyxuf/77x/AknzJyCAuTrTgqPcDlz g4pJv7hoXCJncHmq0+B4fbB8vVSZX0u1etykOhaYwr45edvUwX3ct5K9mny7ohRTyc3oHs srkDkFFej63C8mvGG9zgKPo+zW/+SCLloNoQVVe7GlN6UU6AYWPTs61/QUgBXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769562330; a=rsa-sha256; cv=none; b=OILwhdoEuV4OQ+nSZH4KEpeGaIbxlqm3sSaf4osz5OmRASlp0IR7gwAPtYmkb2o7SFY7Xp sxftZGr+qXNn1m5WocSFs5EIe0wo1/xu5WmxFE1iQODq4O/wTxye2lXI7C2AQrZ3B8X6qu /e0JOI8HXG+joSgTU3G76TmcXJY9vbyDWQ5LP2+BIeEbq/irxlYFmhBSruvn2HWCO3nmUX 4CqEnn/9ZMuzrRiicrJoo+9gTWUnL+wAT3HVhYD1lthc133woVZCyd2njeHfiOeueQZVVL QLPA7+wtdKDub9+H4qxmOEr0yfgkdhotvZrcuCkX5jJiGUQ/tiw5dLlSR+/MiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f13wp2CKSzVng for ; Wed, 28 Jan 2026 01:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e030 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Jan 2026 01:05:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Joseph Mingrone Subject: git: 9f0b953443b7 - stable/14 - lualoader: Add distinct brand for installer 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9f0b953443b7dd7f33b8a461651c9d9ed2912d46 Auto-Submitted: auto-generated Date: Wed, 28 Jan 2026 01:05:30 +0000 Message-Id: <697960da.e030.4dbdec8c@gitrepo.freebsd.org> The branch stable/14 has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=9f0b953443b7dd7f33b8a461651c9d9ed2912d46 commit 9f0b953443b7dd7f33b8a461651c9d9ed2912d46 Author: Joseph Mingrone AuthorDate: 2025-06-23 20:47:20 +0000 Commit: Joseph Mingrone CommitDate: 2026-01-28 01:03:36 +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 (cherry picked from commit ac7a19d41ee5eb1271c46fbc620b2f98dffa2230) --- 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 d52171f955b2..d71449fa78bc 100644 --- a/release/Makefile +++ b/release/Makefile @@ -206,6 +206,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_brand=\"install\" >> ${.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) @@ -245,6 +246,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_brand=\"install\" >> ${.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) @@ -281,6 +283,7 @@ dvd: packagesystem ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.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 44d2faf36e5f..47c70629ed51 100644 --- a/stand/images/Makefile +++ b/stand/images/Makefile @@ -1,7 +1,8 @@ .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 4462a803beef..f44bf682e25b 100644 --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -25,6 +25,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, + }, + } +}