From nobody Sun Jul 24 15:40:40 2022 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 4LrS7F01kkz4WrcZ; Sun, 24 Jul 2022 15:40:41 +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 4LrS7D6hm6z46t0; Sun, 24 Jul 2022 15:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677240; 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=eXGM5gyLa4DI8w+5VIdxtqskiPpAY+dnKNaU2c7xH5k=; b=JlwEeA+cURiOk6CLNsYtTePTIoMqyovu0+1ekzWsC5DMVUfsFee/muXn95OkqhDws5Uink CyFtOjRcGU66WWfntpxhr0qFItHLlJ5eMlvSqQjpLcmKSgS98KibGJyqwSeHW6eOPKNwWh abm0SZXa9bXfp34B+nx2f05yQ7L+2gH5HFtmmtFBGSba7zxbMk6FS/Hh38+sPcft69jwOY a/C7o0QNSBY5U5iKgz+b2seLJeDdhhzh7xLysct2qig3H6T4qIAeAUfgzi0GI78l+xWrH2 r6KmD+eXIjW2ZCn5qkRuOpYRPRT2uwiPOuFTuMQMfHg8MPSjhOwJGH8tme29XA== 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 4LrS7D5k2GzNlh; Sun, 24 Jul 2022 15:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26OFeetM016781; Sun, 24 Jul 2022 15:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OFee64016780; Sun, 24 Jul 2022 15:40:40 GMT (envelope-from git) Date: Sun, 24 Jul 2022 15:40:40 GMT Message-Id: <202207241540.26OFee64016780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 9e4047d9d92c - stable/13 - bsdinstall: use gpt/efiboot0 label in /etc/fstab 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677240; 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=eXGM5gyLa4DI8w+5VIdxtqskiPpAY+dnKNaU2c7xH5k=; b=f1IHtM80g24xC13lNdwZMSRFwyEsSIJqHxEYsew8K0mFJGm2YTp7bEek2NOUf2/org9YvJ RuYCpyqSfRU9seRBhwzNy6iZ9cRaLdzYnboRMJFikQpQE/ow5Tm7Ne7HXPNb64mHbIYLWD 8/SrPwEkUgpvfB58D6/VAAvhbiEcKJHLIGZGrIMZFcdRPbX3n/x+xn0AH/wa3uyZWRVa/k ui1VipQMvrJbbgvCsVr37v9xxhW+oQGPeA9JwkSPWFp/4xTjncckZQqcdd7mpU4tj4Yrhr aNc/pLTPq+2MkNpoEttCf1TlITch7MTj6Z4pLTJHufck6io1BMvz9165Rzv65w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658677240; a=rsa-sha256; cv=none; b=UpNYMUh74F2C/ubcKjnbDwIWdbNOr6Zluy6Y+6l/UUf5yQo/pe8KEnEe9PJaPmuj8r0+Fc BaD3FeJgnSvzCBJS7+wykGnsPSpJHiIDxoQA27xyK6xkBlQ/xP4r+fmIGNElAF1bdxW0vW /SGiBnC5PaRVBeEjaWMpl2Gkh3yeQ5hB1C1AO9p5d9iDPFuvMA/sr5+575RzfidYB+/OTc anQfqvBjYHkzlcX5X2vQ8zbl5g2buYbQk75LiogN6vT+ViwGpO+O/+PKr3l0iaZtoCB5YA IVGi4jOCLoEP/Lcz9aYQ2J+UcJZFM5YNcbme6/GlUF/6MzkL8s1vTt67eeelsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa commit 9e4047d9d92c4eef9fea421e9fc4b0f4dbc288aa Author: Alan Somers AuthorDate: 2022-05-24 18:24:12 +0000 Commit: Alan Somers CommitDate: 2022-07-24 15:39:26 +0000 bsdinstall: use gpt/efiboot0 label in /etc/fstab Otherwise, boot will hang if the numbering of disks has changed since initial install. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: brd Differential Revision: https://reviews.freebsd.org/D35309 (cherry picked from commit 7919c76dbdd20161247d1bfb647110d87ca5ee0f) --- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 7efa40ff8d20..14fbdd0d67fb 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -853,7 +853,7 @@ zfs_create_diskpart() # We'll configure the ESP in bootconfig if [ -z "$efibootpart" ]; then - efibootpart="/dev/$(echo $justaddedpart | cut -f 1 -d ' ')" + efibootpart="/dev/gpt/efiboot$index" f_dprintf "$funcname: configuring ESP at [%s]" \ "${efibootpart}"