From nobody Wed Aug 17 17:41:07 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 4M7Fg76SFtz4YmQk; Wed, 17 Aug 2022 17:41:07 +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 4M7Fg761w1z40kl; Wed, 17 Aug 2022 17:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660758067; 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=dBxdYwsbhb+U/hx99G15xSBP8XbTxGTBmvH4k6Cl2Ic=; b=C2gsvJQ5nMWYJGbC8Kmis0uyPvOQadepxIQ/woa3L0GIbu7gb+RVLH+XwRlm3a2Ee2w8PW mlVO8AUsuh1Lh5/0mFkDVA8KFWnTEgC9yVZSB1+6z5t2WfaojNouEtygW2b5B3OcPVj8k2 vtVE//2saers7AK4beOkIEWFAcPhkcdgyzXZ14HBe5yvcZ0QWJCe8YAsH1/QKov7n+XHRe +3jmcPwNYlWmM5vONZ0DrUcFoKGPEOe0tRLctgqRRwVerUmC+nx2UiT35V+xehmYZHpR5q fY57Op4eVlND2d51+oZfOmYYBKBO139PbltMNkxCs7uDEnD4LmvRTibo/f93aQ== 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 4M7Fg754z9zxXK; Wed, 17 Aug 2022 17:41:07 +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 27HHf7am011137; Wed, 17 Aug 2022 17:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27HHf7RC011136; Wed, 17 Aug 2022 17:41:07 GMT (envelope-from git) Date: Wed, 17 Aug 2022 17:41:07 GMT Message-Id: <202208171741.27HHf7RC011136@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: ef8b872301c5 - main - stand: Flesh out the zfs image creation 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef8b872301c5fbeeea3b0410b369b8f36584cd65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660758067; 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=dBxdYwsbhb+U/hx99G15xSBP8XbTxGTBmvH4k6Cl2Ic=; b=lPf3gCS1VOpz58PYdTdFxKX+1L1W1OuNNOP3DM4MbkVvaF3pDWiZWN5NuVLKYNtvj/GiVJ FgZyMqz4lrJyZsGcI4aA8LklNBVTjmd2oSwANhKkso/lK+28rszrIad+ovzOi5OY3PcRCy Z1qmrZdTjzw7dOoAKF64UyvA7uXF6cuANMv+55fIItffgzt/5yd+HLyjlfPWVz1x42TsQ+ iwq5aE6pkLaYsvi3m5ZjlfbYeVcTRSgLiZCvrvL8NXDuaxjacuQOOXjP5SbZ7luEisT1Av CK8oC5ic/TXFKwKZXvlMkKbMlrvE8b1yhRriq53PluhobaBjuNKrfflFj+HUjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660758067; a=rsa-sha256; cv=none; b=NBtdR6BBSpChho1Pnx7ZT3YLHabsjA7tCQ6b0QXbZfD/5D+CC86nN3piuHHEKZUqMD76+L WPqdckqHLGrRqTCKtqsQtVy8beCFKlvscbEZF17ILj/KD8Bp9FvZBuFc8FBAUrVurljSMm jZ4bdIvAgg5RU/RV9KYOf+bcV564FN7HU5A6EEVtN4+qQbN+Q5lrS0pvvvdF6FuCMFUe85 ZBEmH5gvtEO6LLwQGPeLit7xCRqz2rOuZAHpLCqAsV2X0Oza9hzC/XsdTD6qFNZ5iBt/+6 7GhpvIqASJG26/2G1RBppyrklk9Jx/bc5reXxZqT12Dn9mtkoLCQ2ox/JXiELw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef8b872301c5fbeeea3b0410b369b8f36584cd65 commit ef8b872301c5fbeeea3b0410b369b8f36584cd65 Author: Warner Losh AuthorDate: 2022-08-17 17:33:58 +0000 Commit: Warner Losh CommitDate: 2022-08-17 17:39:53 +0000 stand: Flesh out the zfs image creation Move the mbr non-geli zfs cases to no-priv creation with makefs / mkimg. Add comments about the weird thing we do for MBR + ZFS + Legacy. Add comments about other architectures. Still need to think through how to leverage a completed universe to do all the architectures... Sponsored by: Netflix --- tools/boot/rootgen.sh | 150 ++++++++++++++++++-------------------------------- 1 file changed, 54 insertions(+), 96 deletions(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index f087afa5ad49..06e8a1ec8245 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -214,35 +214,21 @@ mk_nogeli_mbr_zfs_legacy() { bios=$7 pool=nogeli-mbr-zfs-legacy - dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512)) - md=$(mdconfig -f ${img}) - gpart create -s mbr ${md} - gpart add -t freebsd ${md} - gpart set -a active -i 1 ${md} - gpart create -s bsd ${md}s1 - gpart add -t freebsd-zfs ${md}s1 - # install-boot will make this bootable - zpool create -O mountpoint=none -R ${mntpt} ${pool} ${md}s1a - zpool set bootfs=${pool} ${pool} - zfs create -po mountpoint=/ ${pool}/ROOT/default - # NB: The online guides go nuts customizing /var and other mountpoints here, no need - cpsys ${src} ${mntpt} - # need to make a couple of tweaks - cat >> ${mntpt}/boot/loader.conf <> ${mntpt}/boot/loader.conf <> ${mntpt}/boot/loader.conf <