From owner-svn-src-all@freebsd.org Mon Sep 28 06:00:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C78B83F75E0; Mon, 28 Sep 2020 06:00:56 +0000 (UTC) (envelope-from imp@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C0Bhm4zFdz3f9h; Mon, 28 Sep 2020 06:00:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F99B192B3; Mon, 28 Sep 2020 06:00:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08S60uxh035952; Mon, 28 Sep 2020 06:00:56 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08S60uSS035951; Mon, 28 Sep 2020 06:00:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202009280600.08S60uSS035951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 28 Sep 2020 06:00:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366217 - head/tools/boot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/tools/boot X-SVN-Commit-Revision: 366217 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2020 06:00:56 -0000 Author: imp Date: Mon Sep 28 06:00:56 2020 New Revision: 366217 URL: https://svnweb.freebsd.org/changeset/base/366217 Log: Speciy the dev in an easily changed variable Rather than hard coding ada0 everywhere, use ${dev}. Also, set dev=vtbd0 since both qemu and bhyve support this. More work should be done to use labels instead for fstab. qemu scripts likely need adjustment. And we should also likely generate byhve scripts too. Modified: head/tools/boot/rootgen.sh Modified: head/tools/boot/rootgen.sh ============================================================================== --- head/tools/boot/rootgen.sh Mon Sep 28 06:00:39 2020 (r366216) +++ head/tools/boot/rootgen.sh Mon Sep 28 06:00:56 2020 (r366217) @@ -7,6 +7,7 @@ iterations=50000 # The smallest FAT32 filesystem is 33292 KB espsize=33292 +dev=vtbd0 # # Builds all the bat-shit crazy combinations we support booting from, @@ -20,7 +21,7 @@ espsize=33292 # This assumes an external program install-boot.sh which will install # the appropriate boot files in the appropriate locations. # -# These images assume ada0 will be the root image. We should likely +# These images assume ${dev} will be the root image. We should likely # use labels, but we don't. # # Assumes you've already rebuilt... maybe bad? Also maybe bad: the env @@ -42,7 +43,7 @@ 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 < ${mntpt}/etc/fstab < ${mntpt}/etc/fstab < ${mntpt}/etc/fstab < ${src}/etc/fstab < ${DESTDIR}/boot.config cat > ${DESTDIR}/boot/loader.conf <