Date: Fri, 23 May 2025 13:42:33 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0a86a8ace333 - main - bsdinstall: support offline pkgbase installation Message-ID: <202505231342.54NDgXKt018582@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a86a8ace33374b1dcf7b43eab85db2f76537522 commit 0a86a8ace33374b1dcf7b43eab85db2f76537522 Author: Isaac Freund <ifreund@freebsdfoundation.org> AuthorDate: 2025-05-10 22:51:06 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2025-05-23 13:41:49 +0000 bsdinstall: support offline pkgbase installation Reviewed by: bapt, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50347 --- usr.sbin/bsdinstall/scripts/auto | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 75bff522a63f..fa67dbf671cc 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -161,10 +161,22 @@ if [ $? -eq 1 ]; then fi if [ "$PKGBASE" == yes ]; then - bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" \ - --msgbox "Installation of base system packages currently requires internet access. The next few screens will allow you to configure networking." 0 0 - bsdinstall netconfig || error - NETCONFIG_DONE=yes + if [ -f /usr/freebsd-packages/repos/FreeBSD-base-offline.conf ]; then + bsddialog --backtitle "$OSNAME Installer" --title "Network or Offline Installation" \ + --yes-label "Network" --no-label "Offline (Limited Packages)" --yesno \ + "Would you like to fetch packages from the internet or use the limited set of packages included in this installation media?" 0 0 + if [ $? -eq 1 ]; then + export BSDINSTALL_PKG_REPOS_DIR=/usr/freebsd-packages/repos/ + else + bsdinstall netconfig || error + NETCONFIG_DONE=yes + fi + else + bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" \ + --msgbox "No base system packages are included in this installation media. The next few screens will allow you to configure networking." 0 0 + bsdinstall netconfig || error + NETCONFIG_DONE=yes + fi else export DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}" if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505231342.54NDgXKt018582>