d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bsdinstall: allow an install script to access packages on the DVD

Browse Source 
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
This commit is contained in:
Alan Somers 2022-05-26 15:39:20 -06:00
parent f92e0d6acd
commit 6a02539959
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/bsdinstall/scripts/mount
View File

@ -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

7
usr.sbin/bsdinstall/scripts/umount
View File

@ -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 '{