From nobody Mon Aug 15 18:47:35 2022 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 4M63Dl51vqz4YXcw; Mon, 15 Aug 2022 18:47:35 +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 4M63Dl4Plvz47K2; Mon, 15 Aug 2022 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660589255; 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=2RKzFZXOlzJYZslKUdznVDONq7VScyVdqq7SY2r49Zw=; b=HnqoFk6J3WV3l2H9klKmRWr5YI8m+g2/O8RAzT2ZVXil2u9ZfqajK/UMMqr0sjy42Wojih X8yPMqdCj8V8ObTWlU6KVlWMKeTxTI/jO2kz/ZPPTHzWGZCBvqgLDSo6lS6HD8JcAWh7VE uQrK/LMY003b1v0Nr7GAKARwnLlTP4JxEJqOyLfa6C6XOnFC3Zkjye/WhorPInFEEp06Xe h2+MB6Dop29B1si6JLNFBQTMVU2pQLAXTBoK8fPhKIA9vdRkD5ixxmLxJ0XUavORwc87aP 54HV1PAr9xxtiJuTV9hvsCIhg2lLXgLrRohEKPP7UFCHzckIul3Aj8mcdeALFg== 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 4M63Dl3FslzgQG; Mon, 15 Aug 2022 18:47:35 +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 27FIlZ89027191; Mon, 15 Aug 2022 18:47:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FIlZrG027190; Mon, 15 Aug 2022 18:47:35 GMT (envelope-from git) Date: Mon, 15 Aug 2022 18:47:35 GMT Message-Id: <202208151847.27FIlZrG027190@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: 159b158a1d09 - main - stand: Update testing harness to start to use UFS labels 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 159b158a1d09b2f8b6e48900887f840238d14f44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660589255; 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=2RKzFZXOlzJYZslKUdznVDONq7VScyVdqq7SY2r49Zw=; b=CDleS4LePWWm2fdFBNHnrXsus0ukjFPIJCie1GrqfOY6kAcc/fuN5OgIzmb4g+oYGmx6BG BCTBk7FpdFUc5nc0GCPp9pfOChm3Ufp0XoG/DVlY+T42BK1SlAwxB2Yi2Dkz6sEtQFhGZN v0N84cbIdLSp1MgCEO4lj9+afbPSzY4R3TgSlTqqBk70Qrzgjkb1BChSKA6kiO79Fi72i/ QlMInrHwmWxJWU1bhPRznR5S3MqAM8sm/yt521zR8ILfgwnod9d3VlNumV8RmxqoZz+2Zd kFY+YD9QqozBSPX414a/HHN2TYekS5dKgxRtH/wRjDisYDBoaidTMTriiHiKMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660589255; a=rsa-sha256; cv=none; b=SwhXZBKIb2Z1giwHPf2PIQpOY2RASo+i0HViNHH+ZHSyIh7uKDm3QvWRwBN9R2Gu3vwBu9 6ycsAnOy0e5U/0YUE8qbvJPW66fAmAm2Bi7W8jwq5U1/ASzdUPVW+AkEumEjZcnB46vqik +rKpmzpiCAx5VXAwaKbiI/T5RBEWzTQNl6MAE2GmbbkaiJH0dXXVVTFim7D74jesqxmUPJ QnPvUd5t0eeBnlowvBcmeHfJ8P9Gb5pFggZYeyI0Mko4Z8AdOivHwf2S17hnCOBpQShLxU jUY6ReglGrHUfbjcXg2y1y/DDrO6BIflO4ijDB/Xw2y7Xba355zBQ3LyTKlGnQ== 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=159b158a1d09b2f8b6e48900887f840238d14f44 commit 159b158a1d09b2f8b6e48900887f840238d14f44 Author: Warner Losh AuthorDate: 2022-08-15 18:09:55 +0000 Commit: Warner Losh CommitDate: 2022-08-15 18:38:32 +0000 stand: Update testing harness to start to use UFS labels Minor changes to the non-geli UFS targets: migrate to using ufs labels so we don't need to know the name of the device we booted off of. This doesn't change the GELI test cass just yet since I've not tested them. ZFS doesn't need these changes since we don't need to encode the device for it. Sponsored by: Netflix --- tools/boot/rootgen.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index 2f840cf6e31e..3146b06216a2 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -15,14 +15,14 @@ dev=vtbd0 # and copies that into the ~150MB root images we create (we create the du # size of the kernel + 20MB # -# Sad panda sez: this runs as root, but could be userland if someone -# creates userland geli and zfs tools. +# Sad panda sez: this runs as root, but could be any user if someone +# creates userland geli. # # This assumes an external program install-boot.sh which will install # the appropriate boot files in the appropriate locations. # # These images assume ${dev} will be the root image. We should likely -# use labels, but we don't. +# use labels, but we don't for all cases just yet (see GELI cases) # # Assumes you've already rebuilt... maybe bad? Also maybe bad: the env # vars should likely be conditionally set to allow better automation. @@ -43,9 +43,9 @@ mk_nogeli_gpt_ufs_legacy() { img=$2 cat > ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab < ${src}/etc/fstab <