From nobody Sun Dec 1 04:56:51 2024 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 4Y1F4z6lcfz5gCmG; Sun, 01 Dec 2024 04:56:51 +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 4Y1F4z604cz480h; Sun, 1 Dec 2024 04:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029011; 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=VoEmjAldbKTMeKGxdFdVbET+VQharQf6DBLRw45PXQk=; b=U6S9/ZTAhHue7OEg6X5bMTIyKBl2VyeOytRWv+JtgoDmE2gebD7fVfdMBUm1SAa+gjA9/2 9jXTtjJEx6P7qLW9b5YERL0lbbi3O+ZGkCXwMPtGvNy4vv0BNMbdCmI4n0Os97k5emN5u3 gFvaNA2FrW8HzkcynjqZ62CyC4TP2naN8G+JkfdaGCi6eaR+wqR51Yb5Uk/wQ/MKMwjj44 /M1fT0eYrDLpoe6QH/KX4FnxSwcFSIlqfs3dftGGpFTcQSn93LqVvECxLcu12v4XyBvGKh EKRUMTrLT6TU6WwSf11FRd1m6w/kqLkm6E7Fi5oCo24kcEPoXeZTaok8orftLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733029011; 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=VoEmjAldbKTMeKGxdFdVbET+VQharQf6DBLRw45PXQk=; b=VSuWM/Wgtl08Ah1MuNoAuwWzAqyN4KpmoDn+ajvFOnZER7H6/aCbiwyzGlj7N6yhKCl+m8 KzitYu27tYtqEQJ2J15kJ1qbsLOpanGTxPMksqRVBccrXciGTnUXcGNE+uQ+AxfRJYtmxg fojv/KCgD0wuRvxewqoommnCOrcOwAG9rAAAajEiomY6PKedPtZ5gkorG5jmDc9bKDNbLy QEEDbq8R/wTKP3Jks7/fPRlnz8yichDhBOf0LEKMlo9K3BGotln/+JTYQ1MJChH6KsCq98 3jdEpeBY51QRRAQvBeQzuEWdggdWOJAb5626mqLDWp1WiTyoxdqId/2KW9fLpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733029011; a=rsa-sha256; cv=none; b=hyq3QUprWpd4fX10go9BlOBAok+s6WMagb93OQEVgnW5gqalcw2Y8FEc/wRSrXdRRnR6Wa vb6IROV1OP0OUl5XopdnGP0p8jZwHX6djP9pY10bvptJRUbCMc2C+M8Ki0xiG7U3RktLuw bbRd2LcUiUfduKWQMsXWjJ8h3XdyFaEfGJPfH165/JPOXwRMqtMEdYGrPdfNEz0rswXBSN Zt3p+/RPVJ1Zi/ufUwDIMzpV3/BU3bwbTcreYYeYJ4IUNBDqgG9mfjDvLUN4aP08JFzF+t CPxgHBcqOzhSUFQLr/TlgJH/XaVj9pml9f2D4ZcVdG26Q3V9ZioUQTHIlkHG5w== 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 4Y1F4z5bR1zdxf; Sun, 1 Dec 2024 04:56:51 +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 4B14upeV094276; Sun, 1 Dec 2024 04:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B14upjD094273; Sun, 1 Dec 2024 04:56:51 GMT (envelope-from git) Date: Sun, 1 Dec 2024 04:56:51 GMT Message-Id: <202412010456.4B14upjD094273@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: 09cfc202bc05 - stable/14 - btx: Align the PXE prompt with other options 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 09cfc202bc0521858185605edbe8d7f7f037a249 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=09cfc202bc0521858185605edbe8d7f7f037a249 commit 09cfc202bc0521858185605edbe8d7f7f037a249 Author: Tatsuki Makino AuthorDate: 2024-09-30 19:41:42 +0000 Commit: John Baldwin CommitDate: 2024-12-01 02:46:03 +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 80c7702840c1..6c48e380a32b 100644 --- a/stand/i386/boot0/boot0.S +++ b/stand/i386/boot0/boot0.S @@ -581,7 +581,7 @@ intx13: # Prepare CHS parameters */ prompt: #ifdef PXE - .ascii "\nF6 PXE\r" + .ascii "F6 PXE\r" #endif .ascii "\nBoot:" item: .ascii " "; .byte ' '|0x80