From nobody Sun Dec 01 04:57:41 2024 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 4Y1F5y057Nz5gD3c; Sun, 01 Dec 2024 04:57:42 +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 4Y1F5x6dfRz4Br1; Sun, 1 Dec 2024 04:57:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029061; 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=GB1AuUYkeKOaDC/Ss5+zhXUKG3+J8UW1kD2mey3QQPs=; b=HbBfuxYXMOFtPjzKv9SWtTyA+CfAHB46FUy2a4xj/l2/5LYpCmcjRYsTgm7Ey4Um4wEAHs LLHeATZ9BS/d8NkAvdcBcyZ0fOURoKEJyFbHeEdA+AII88NyVTzSdcuv9A9YJ2bXCJGW6K qNBskWDrU1ulUVhWKDNU+UK5d/siRb4s0NMqHDVZVitGJIGpWL9AQ3lKMbhSKRs1+iYHg1 8LjHlUrwdO2VMZbJu0a5PKtl+oIqIOj63/YWCT9bIRyeWclYCFNls4yTG/QKC0dU88sFI7 vBq5VxT+7B/fnJ6oX5PtV5WMpM3EbR6LZUr8WrnwLhmmNt+d9PX9MG+Y2EDxdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029061; 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=GB1AuUYkeKOaDC/Ss5+zhXUKG3+J8UW1kD2mey3QQPs=; b=M/r/9bXNG3+56dahzg+GCL6ADhmsYEPdTP3RJiVTo8NniMwV5fyJaFERFntqgjZMgu3jye B4BU+DifPXrU9MNV+7Ufttpv7LkRdN1tFnYHUpVgWYRduQg0G2dP++dt0IvOpLZXAZVK1t egh75Lgf+8Hl4LXSt33WXvzjQId6UkCX2FTGc8WqegRvKYiE+NnW0LsY29+mt/ygha3pYB jn6AR3khinqtdAtOpc2ySYdyBSSx+a1k4QSBJZYNNBSWzyxl6ynlkrJ+pfoPWDO0vXHWfh luJzfJP/tJXPbQrc4heY6l2gWcWpy3PQSiOn+/JERIGe14nnlri6Qp/8j+5ANA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029061; a=rsa-sha256; cv=none; b=oH60SAFVa5a5oDrveNeJVX7QDnvrGbu5Pp6L/7BM5CUgDi05z9vyNyF7iiDXgEf0Z2Cud2 PBe9aG9lWZDJ4L7T1/LBcOWOL4smvq7w8NrtxG2DVJkidxQ5Z+aPVBZzBi0VktaduqW1/r +EpdUgcsdfSVvuJfp0bu+OAQGI8Jeq2l6FXiHXOdPJE2+UAiQEyQOqSBVOXaUyOPx7jyMr 7bGrcXQFZ52iktLe59t3lfQdH34j/zz1CXHPsSa9THY60KnJDUgKyERtofhun/sILjKf0B nqG7ZkQCEgvHSCl4GkIw8V+GqRBJyImcwEuxZ0J4CxHKOiJEigj7B0NbUfOCsg== 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 4Y1F5x6GHjzfNg; Sun, 1 Dec 2024 04:57:41 +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 4B14vfRt096664; Sun, 1 Dec 2024 04:57:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14vfsP096662; Sun, 1 Dec 2024 04:57:41 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:57:41 GMT Message-Id: <202412010457.4B14vfsP096662@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a845238dd609 - stable/13 - btx: Align the PXE prompt with other options 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a845238dd609a1f18e5b80404545122f498e7f2c Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a845238dd609a1f18e5b80404545122f498e7f2c commit a845238dd609a1f18e5b80404545122f498e7f2c Author: Tatsuki Makino AuthorDate: 2024-09-30 19:41:42 +0000 Commit: John Baldwin CommitDate: 2024-11-30 21:28:51 +0000 btx: Align the PXE prompt with other options To fit within in the same space, drop the newline before the PXE prompt to make room for the additional space character. PR: 281494 (cherry picked from commit 4fa4693dcdd8176f1d12cce5f026eb2052036dfc) --- stand/i386/boot0/boot0.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S index d92f8dcb05f1..79ff2ec6610c 100644 --- a/stand/i386/boot0/boot0.S +++ b/stand/i386/boot0/boot0.S @@ -588,7 +588,7 @@ intx13: # Prepare CHS parameters */ prompt: #ifdef PXE - .ascii "\nF6 PXE\r" + .ascii "F6 PXE\r" #endif .ascii "\nBoot:" item: .ascii " "; .byte ' '|0x80