From nobody Tue May 24 19:17:44 2022 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 7C6231B38D1C; Tue, 24 May 2022 19:17:44 +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 4L73qr3686z4T1K; Tue, 24 May 2022 19:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653419864; 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=QeNu8J2JQ0PNUer6E44NZ0YMC4vSY846naKyg2jES4E=; b=ZRYjBd0WUnEVAELMtUUvZohOWcCYLWsg/U0YTp9d5wPHxIFjcI0vhdLh9sBP0sJ2DZIvGK N1A8GRNrwTdeRSqtPtz59vLJKLOpSrqIwfPg7oxNzdPu3QK9N/uO7T2LYGOvBELrXkeZSx a/NOHSgSkJnqNtRfFiLp/yqOUkNHliYq7FMs0cinscjQB4aNgdGY6/xBfbZImv7Qt5pRM0 xKwz/vEYDONOiYVtNeO1GwA7umYzH4RZH2mjSIMG1WXOzQ7RNlf6vkTcN0kCF4YgBVQBRp lKBQqLTXdDOosbk3WgUDcLcV78P3ihxitqsBmsNuoUVmuFAy/iztc4sGeJuq+w== 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 4A5042078; Tue, 24 May 2022 19:17:44 +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 24OJHiqL099733; Tue, 24 May 2022 19:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OJHipu099732; Tue, 24 May 2022 19:17:44 GMT (envelope-from git) Date: Tue, 24 May 2022 19:17:44 GMT Message-Id: <202205241917.24OJHipu099732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 7919c76dbdd2 - main - bsdinstall: use gpt/efiboot0 label in /etc/fstab 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7919c76dbdd20161247d1bfb647110d87ca5ee0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653419864; 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=QeNu8J2JQ0PNUer6E44NZ0YMC4vSY846naKyg2jES4E=; b=hJ7zXRMtG9Che29KEy0nPa2V4EkTdCmIhugauYHcPj9xdu7ihiah+/7Jnsk3poEE4JeFPC 6qCNx35i6VrLPKHlrUjW9UsrG7rBweetEXNy0if5DxlOuRUUleKlg1iU8AVqdI03Be+8Vk p5EY9kPizzKlKq9P0UJ72ABzf3dZn1kWvtwBa+VUMBAZB32AAOTrrioNMcIPXv++LECbAY APAi1OwQRNH/SHw2zO4P+TXvn5uH8P5RU67gBe6vgBBedxkkSwp5sGEObT93synhZ/26TT 2QYlztJxDxET+2ydlEmtCpe8Wpgr8awHIb9RHg661oYlO4vNCd3xms4IpgS1JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653419864; a=rsa-sha256; cv=none; b=W6Kh7qpc44YNjizCJb0GE0M9BZ4gaRpxwEasCz5b50cfUVtCV8E7qJHVb+S4wKMT33H/cl rdVQGGSqjEbuWSlaILj81bGV77c2kknFikTAXCOeUArEhmjQMdBApxBdLZ6vl8CoP/XZvr JFoGYGPMEZLc29HIdC/M58UoUgzHap2PvkIw8bg5LH26G9z5QKfZOxcTEBh/QezFkH/ZHi r8pHn6w26pQZ232gW//qImVG9Gom7WxUP2ef9qYftnBDaI09CgoTckbqGSiHs+BsJEBNzh 7G/sN+8B/yBEbGh8lwZEDvMppXMp3zmEZDmW4JzJnFgLwpEGeL54HhCgozVwUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7919c76dbdd20161247d1bfb647110d87ca5ee0f commit 7919c76dbdd20161247d1bfb647110d87ca5ee0f Author: Alan Somers AuthorDate: 2022-05-24 18:24:12 +0000 Commit: Alan Somers CommitDate: 2022-05-24 19:17:10 +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 --- 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 56af9eccd78b..a98cf4a33f28 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -868,7 +868,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}"