From nobody Sun Jul 24 15:40:43 2022 X-Original-To: dev-commits-src-branches@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 4LrS7J2qCmz4WrsH; Sun, 24 Jul 2022 15:40: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 4LrS7J1M5bz475T; Sun, 24 Jul 2022 15:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677244; 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=spE22TNg/VnvWV5cpAivW2VLzqE3JBfN6TkBGya6ny4=; b=h5bkWjK/Nq50DD2qeKC5A/Y+orcYM8BGeUPf/t1T06UDtUbSlQz2S4uS0dHNMwWkFrrPeZ U2oWDjrLm+A+7kY/teTFK1KucWDV81aeX0wLrcwcyamzOjJg7wI7MHeIQgeb9i+wmy+fGN hXN4IKH2Wmq/an+d77SW1EN0FQPqCbGqMBGyTjgRPydEW7K9dcG1eYZZQ0zNLRZPzRoEhS tLkOc8N0ToIyYT8VZadmN5CT38xE76MPw9W7oCDlRwnp3JDeBoiiuBJkMJFxQELTNDd3pv PfF06/iYP6CRc5j1+vK4z68uSlNNbma8ZMSD/8j27YF5qIk+pwoWb6xxm7ZIMA== 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 4LrS7J0SHFzNvQ; Sun, 24 Jul 2022 15:40: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 26OFehYZ019298; Sun, 24 Jul 2022 15:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OFehr4019297; Sun, 24 Jul 2022 15:40:43 GMT (envelope-from git) Date: Sun, 24 Jul 2022 15:40:43 GMT Message-Id: <202207241540.26OFehr4019297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 504ac101ba28 - stable/13 - bsdinstall: allow an install script to access packages on the DVD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 504ac101ba2848d79bce3cd3011fea0438b881e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677244; 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=spE22TNg/VnvWV5cpAivW2VLzqE3JBfN6TkBGya6ny4=; b=NgVVJ3JjX5Blc2JCySEsJ2WOff2bLLWXIIEP2ECIIGqPVoOptur7Y/t4mxyKkVvFUOYhM7 hC87vR/mcDlB+gNrwBH8tcSpQimtMX/ZQBv5epmFYGt/zHD/4LdBMLcQQ+pEUy5iL3tJLD +3oNAw+rGPdNIw1019grUYCocz4Rw30q1h3KyQ4fOUyVzQsVo0Xm/+cCq7AqMdJTE37/Kw RRBoTT/RQqdNBRUUVkdBXGiFDa9cJ5+/HbW0fe3BRhWv1uF8SEWl0Y+dpd4eH83s2eWsrB 0ohsPVhRBgk5uLlFXfqwaXuhHNIgmrK1z/PQzN6QLV3Hm/4Xhv51/1e7Jhv2fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658677244; a=rsa-sha256; cv=none; b=lBqn7w3ls5PErR2Yxp0y9LasvX84tx7aFFzwTPIgVp7arINHhgA4de7sjLCWOSe4p/V+Ah wjzGqNPf/ykw18BN8IrJGIuqvxqCbOw4Bx6x1BYuPi7J8WL5MsIKx0p7VwLjkKHufFDOK3 bS8wLGEpUR3ZMKG/p2m2PVaTmz2l+KwYr0EADO1zApCi/D/DaME2+QmZ45mlzvLJBZsMOF aKr1IRBIou4EElK6pLR+aYzGud/kV0tIfGNPFPI9RpQhEDuImDfVYY28ymXxlAuD+arJgN Af+Yz3PP96GmkbSKlEMu1ztwKwGOngIHgkFyfYosYkVEkDZmw4TEx914w+esqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=504ac101ba2848d79bce3cd3011fea0438b881e2 commit 504ac101ba2848d79bce3cd3011fea0438b881e2 Author: Alan Somers AuthorDate: 2022-05-26 21:39:20 +0000 Commit: Alan Somers CommitDate: 2022-07-24 15:39:58 +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 (cherry picked from commit 6a02539959cb36c4777f962d3d7ef4a76fbe0c24) --- 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 c7bc1aa5387d..244f11fa215d 100755 --- a/usr.sbin/bsdinstall/scripts/mount +++ b/usr.sbin/bsdinstall/scripts/mount @@ -53,3 +53,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 '{