From nobody Tue Apr 23 21:43:27 2024 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 4VPFww2kFkz5J81h; Tue, 23 Apr 2024 21:43:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VPFwv6z0wz4vgC; Tue, 23 Apr 2024 21:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713908608; 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=8BsmIAZrMEVMPyxVVP46Q+whkfQa0gke4R4LVZnQmeo=; b=ZaihPr8Jezc4rCdsBJ4jKtrmqKrrI9hdAn1fkwOOGHWDB/6icABRI75QoHU9BPWYw0QVMf LntVaHYRCw34Z6C4QWBpS3WUQe9n+p2N4sULjo0JOsGK7rcGFVsWIxT/HZRnrPUv89tV5o tda9LnAe1/BRRQAJ10GqX/pHTudTNWnMnGzLfk2/qWDXfqym7K8Ac4hMCCEbUqAH5cbPDS dqAj54tD95Lv0qq7pzM77chG88ODBeIFvpEvT2pufB8plPzxlNtF5R2S98y8EwHKJ2OyHQ LG7drp+HseyyWXTJGDF1Dvr5z0NNcHMQzjYIf/Xzw3SBiwiopSf+cM0xAybfWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713908608; a=rsa-sha256; cv=none; b=eywGnNcMpF7naqyiwZHOZWei8uAC3k3/B+4wseUL1Kn2XHoB8Mhr5mxt1r00bhBpM+pjNy RBuKfJ6KoXScAb7l+2emgsyokNiES55RT8FB5tdWNLwKMlsDGbvqsm1wIj5oCYM50erTAH 5A2+1u/GTb1VT4EAMFZ6nvreu0t8i2INlhWi3qNKKhSgEbjzMUZbcmOJhAPQXjWkdVRVp4 IP0VskEvsDQ6l5x7DzhVCZrfOHiWTiPD2bA+pe7qdGINUhb7rDkfe/JgTlL8PKvsdCzKg0 uWhxmV9sukw/2r2woNLJsMIO9FckM2v7GL2wO+aGrcANCJHxm4iIKoi62UUeAw== 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=1713908608; 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=8BsmIAZrMEVMPyxVVP46Q+whkfQa0gke4R4LVZnQmeo=; b=iKKSBvs989Dq8nhEMg3wDvHxKwTx9YkU3j9CUru5P57tOltsLBy++L5qNQncU0dmw3vEk2 NxzCOEwhhmNXd0+8N/Jya4JbEUYboIidhstCznSaeAqRg35LfPt/8nK31sZHXEWG/XDCjD h5W0uW/7QAW/C2Ii8AtX91onGumnNugI5rngk5LuGEcgauPELGdkMS464H7hh+qI9iJ9Hr ZqzYJNXE4367RlTcaipLFNyJmbf3/QVYzjlNS+SJD/9BwpoGWOceRp8uPVicnLyEwfXHha tyhuOTMI13atJ6tyJQJgMZu4BMT4TXbgp7Fit9KKfQS4TR/3V2VrZjvG1o5Wlg== 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 4VPFwv6ZN2zpSL; Tue, 23 Apr 2024 21:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NLhR7e080169; Tue, 23 Apr 2024 21:43:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NLhRJE080166; Tue, 23 Apr 2024 21:43:27 GMT (envelope-from git) Date: Tue, 23 Apr 2024 21:43:27 GMT Message-Id: <202404232143.43NLhRJE080166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4f223e0da7b4 - main - release: Change vmimage EFI GPT label 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f223e0da7b4a055d9416f9161b44ffed765a9c3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f223e0da7b4a055d9416f9161b44ffed765a9c3 commit 4f223e0da7b4a055d9416f9161b44ffed765a9c3 Author: Jose Luis Duran AuthorDate: 2024-04-23 21:12:30 +0000 Commit: Warner Losh CommitDate: 2024-04-23 21:13:40 +0000 release: Change vmimage EFI GPT label This matches the default bsdinstall nomenclature. PR: 278480 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1188 --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 0346e33b81b4..93658b9a03da 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -301,11 +301,11 @@ vm_create_disk() { # Create an ESP espfilename=$(mktemp /tmp/efiboot.XXXXXX) make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi - BOOTPARTS="${BOOTPARTS} -p efi/efiesp:=${espfilename}" + BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}" # Add this to fstab mkdir -p ${DESTDIR}/boot/efi - echo "/dev/${ROOTLABEL}/efiesp /boot/efi msdosfs rw 2 2" \ + echo "/dev/${ROOTLABEL}/efiboot0 /boot/efi msdosfs rw 2 2" \ >> ${DESTDIR}/etc/fstab fi