From nobody Mon Jun 13 19:28:26 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 738858535E0; Mon, 13 Jun 2022 19:28:27 +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 4LMM6z1nDdz3p27; Mon, 13 Jun 2022 19:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148507; 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=ByqPJp6rpCMjolI9wEpyRZf482FdbHMKymdQ6CJOa3o=; b=sqKduLu9DNrW1x0LSk3cszprv8kLwQPycPVt4wwqZWuHUdO8TS+9d8DtIXbfYPE3L2HZZ5 T5+p2gTKDKbUWn/hHe0ywjKCyCZOMXpx1gfHoCYeVTGz+NbNrVKThg+Y68O+/YRrUKuUqL Okwl2JCgAbzpaBDEcyqD5/uFTBHu65svgS28DnX8taFy0qEgQLQn3J0qcEJ50EENZlMohP WyTOy6p8/yKOybryFqP4Qc/aM1GDyEf8KG8PWzbpW9Jwe1x5qa42wZfZBvnvx9kou2NBg8 rP9YKWQcUHSNFje7H7Mt7VFODMZFodtlpM2RklO3CXC9CY6nWfXGC0kaZHNLeg== 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 18B871BB94; Mon, 13 Jun 2022 19:28:27 +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 25DJSQrT010431; Mon, 13 Jun 2022 19:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DJSQho010430; Mon, 13 Jun 2022 19:28:26 GMT (envelope-from git) Date: Mon, 13 Jun 2022 19:28:26 GMT Message-Id: <202206131928.25DJSQho010430@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: 6a02539959cb - main - bsdinstall: allow an install script to access packages on the DVD 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a02539959cb36c4777f962d3d7ef4a76fbe0c24 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655148507; 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=ByqPJp6rpCMjolI9wEpyRZf482FdbHMKymdQ6CJOa3o=; b=e2cOqr2jm1k73vZ6G9BMESxLJpF7eLeo4f0O5G02QQ+e/4CqLh9IQDUM0DxzZAr1jzpHG4 bj17UnqtJ/B0QvdOy/lKk5Jatj6ywTtns6IyuMx5nhjfWAhuzcJekPk0r08Spe5fZSWFEI BdfNz4wymypgvM9puUIjXJlHN5VVqoK7QTh60QSCDZ83ovP85T+LorQj9vtAOLBQHKf8Kj KZZ6ma1CRpvxNWTYg/6Sesvm65qbOvuxOBBmOQOkENjHecN73UCxKqkWIZiPtzdWQcymYf PZAArbJBHdOPH+pb/ZdrEsLs7D4uYF2t0h25ueJ/neo/k3pXJ4zgYkdu4pcv8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655148507; a=rsa-sha256; cv=none; b=EcHArEyJnmnZK25rbg3+h8vAY2H57l46Z1A2ywa6UVWJWybJPqefougoFWQvoob7evcYRZ d2wd8J1Jkh059JFo4iBUfxkZ28QhVmMr8ag42HxdElasnRi094KsuNU1zw8VvMZycchsx5 hyhnZFWuFb6yQCZYfGQWjj8/q6NOpoLswoVGzANHyc5li+ugvY3TPLQX1Wr9fuenkWuZlG CoJAnO0gDDboi7Llf2jIv8pDPsi5oUKYP5zBqI+xyGoRHzI+FcJZ8OyYjrGzxsWMAZYy8t 5kEAmk2wFb4EVWX5rtaePiBkMvHQyGgUHVVgZikqjP6vlobBSMWjQjqB5YH2/w== 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=6a02539959cb36c4777f962d3d7ef4a76fbe0c24 commit 6a02539959cb36c4777f962d3d7ef4a76fbe0c24 Author: Alan Somers AuthorDate: 2022-05-26 21:39:20 +0000 Commit: Alan Somers CommitDate: 2022-06-13 19:27:51 +0000 bsdinstall: allow an install script to access packages on the DVD If installing from the DVD, mount its packages in the chroot at /dist/packages. That way they'll be accessible to an install script. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D35330 --- usr.sbin/bsdinstall/scripts/mount | 6 ++++++ usr.sbin/bsdinstall/scripts/umount | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/mount b/usr.sbin/bsdinstall/scripts/mount index 2d7ce14fe045..94b649eaa31b 100755 --- a/usr.sbin/bsdinstall/scripts/mount +++ b/usr.sbin/bsdinstall/scripts/mount @@ -56,3 +56,9 @@ done # User might want a shell and require devfs, so mount it mkdir $BSDINSTALL_CHROOT/dev 2>/dev/null mount -t devfs devfs $BSDINSTALL_CHROOT/dev + +# If installing from the DVD, mount packages where they'll be accessible +if [ -d /packages ]; then + mkdir -p $BSDINSTALL_CHROOT/dist/packages + mount -t nullfs /packages $BSDINSTALL_CHROOT/dist/packages +fi diff --git a/usr.sbin/bsdinstall/scripts/umount b/usr.sbin/bsdinstall/scripts/umount index 3c33eff7e105..a5d96ffffd32 100755 --- a/usr.sbin/bsdinstall/scripts/umount +++ b/usr.sbin/bsdinstall/scripts/umount @@ -26,6 +26,13 @@ # # $FreeBSD$ +# If we mounted the DVD packages, unmount them +if [ -d $BSDINSTALL_CHROOT/dist/packages ]; then + umount $BSDINSTALL_CHROOT/dist/packages + rmdir $BSDINSTALL_CHROOT/dist/packages + rmdir $BSDINSTALL_CHROOT/dist +fi + TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{