From nobody Tue Aug 13 17:31:36 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 4Wjz2d0khHz5T644; Tue, 13 Aug 2024 17:31:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjz2d01khz4ZFB; Tue, 13 Aug 2024 17:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570297; 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=lPN4z41OY8leXdKqmoRyNPHrD7Ia8BZebpY03f7eCpM=; b=EpJuyjWrAhP9Yy3BUJaH0GM66bY9RZaWG3RVGpujql/EcOGSp9PHoGPr/ocEnlrw5ZCKPo d/T3YZax6kNNR03d/XCFUV+9fHb5gxyph3dsuniunZHsAlhfyniX69ywlgLlJKSUq5hMzV G8oux5QgjZPtxce3ys1nMGkbzkw+YtzDPDcjemeRmZlLBPXEP42DBGyzg7Khs1dyaXsIFa B/fFXIPnbchEZ3uUQx9x/IoEreuHmfE9l/3ysY5RSd06om+bYqmALi5McQbm3GHPIJnUBK JnJ415/lDK8YdHOUO5s89Cxf+gKcKNJtEisjyJUEQGXDF86frEjex/zTEcHi8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723570297; a=rsa-sha256; cv=none; b=Bb8B6mihnDzbynJGlqp8piDCqP6wpCuxwOC1yCgpQ90m+8OdZ+eZsNjoMuqbmN21JoVAHP j5edt2jSC30lWv8TPI/knCW4iqweC5oSBUHHWKdXPpyDagCwe2dwxjTkzCDKRlQaeIUreK mU/85CkQe62jEsgqFIeyMsJQbKvWpVDwjNaLQoLX/wdDFmIFCc+k8Gjm+spRJS0N6FqSGV hS7TO/vlmlMHKHw7sPA0Pn0TvbSVzaL0ZsuQCdfEjouP/W0wNBwRp446VXbAt9i0wKS2gE TMV38g9/fEHBXWAZPMpgByXI75oOlD5LS+HLPZGaQhxRSbYg9b0A93ExnXeeIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570297; 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=lPN4z41OY8leXdKqmoRyNPHrD7Ia8BZebpY03f7eCpM=; b=JzJEvxvv1xyg0LzF5cajEnx3kewuAJlcsAcbJPgdVpELQpdkVVBs8SFWMyzh1fsl7k7PWZ NjdoW4kY1HVAQMNa579arECBQHUAPSagQPz9JGQxDBroGHd+R77gOWg2GZWdZF2N10U673 aPiKTWPs9dCGy1ae/yZTbuyvWz9XGZR1cYGIYYgRxchfKCmTOporQq0xSTKIo8Ltd3gmE/ VxsOLvapzpDWW72xFOwMCE26Y4vTgLrIf12bc+Uwdh5sgUtV1dk5WK4peYygcsG9QZtERo vko6uKeT4UJXUNJ+UpH4oCmMYv95swRU8XeBFoC7OrQg2objaQC9gljtwavzQQ== 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 4Wjz2c6l81zKg7; Tue, 13 Aug 2024 17:31:36 +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 47DHVa7s050882; Tue, 13 Aug 2024 17:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DHVa9l050879; Tue, 13 Aug 2024 17:31:36 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:31:36 GMT Message-Id: <202408131731.47DHVa9l050879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c19ac840d345 - stable/14 - pxeboot: Allow a different default loader for pxeboot 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c19ac840d345245887b0e797fd10e7a13b0fd2c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c19ac840d345245887b0e797fd10e7a13b0fd2c9 commit c19ac840d345245887b0e797fd10e7a13b0fd2c9 Author: Warner Losh AuthorDate: 2024-08-05 21:19:29 +0000 Commit: Warner Losh CommitDate: 2024-08-13 17:31:38 +0000 pxeboot: Allow a different default loader for pxeboot Sometimes you need / want a different boot loader than loader_lua for pkeldr. Provide an option to get either the 4th one or the simp one. MFC After: 3 days Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46213 (cherry picked from commit f4762e9135d181f5d4f2a9d688ff803ee53ad808) --- stand/i386/Makefile | 7 ++++++- stand/i386/pxeldr/Makefile | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stand/i386/Makefile b/stand/i386/Makefile index e323a2cef9cd..883cd4a556bb 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -21,6 +21,11 @@ SUBDIR.yes+= pxeldr SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot -SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP} +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else +L=${LOADER_DEFAULT_INTERP} +.endif +SUBDIR_DEPEND_pxeldr+= loader_${L} .include diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index b2ecedd45940..27f9a44cf21c 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -23,7 +23,11 @@ CFLAGS+=-DALWAYS_SERIAL CFLAGS+=-I${BOOTSRC}/i386/common +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else L=${LOADER_DEFAULT_INTERP} +.endif LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin CLEANFILES+= ${BOOT}.tmp