From nobody Fri May 23 13:42:33 2025 X-Original-To: dev-commits-src-all@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 4b3mYk28n6z5xGBP; Fri, 23 May 2025 13:42:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3mYk18LQz4PJm; Fri, 23 May 2025 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007754; 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=xApy3CWU0UailbHTXiSaPNkVPKWdI00eDj1cYcMYNaQ=; b=xJztcu0+EiSGbWNoy6yqBXGWmtu0tW2flDaXlPHTJaWROrDz1Kj/dRQe0YKqZYlNEPNli5 Z39NobMjzY/dC2BYahvLJqLDk9Dvvar9oFu26i6LkXJigWUojuB9TRDfVVGnqh2eziIZLh fe+UKZ47NndAlKb/220RweV5o6GQRH6BQGMbXO+ZjuLUrlqtlmT3ZzLrhsEYp4/0HAwAUc eSXBzMsk2vgkQXOm8fT5DXHrMjZDye173C8w1GM0/WWk1N1Fkes11GNVscciGMdp3Nxfs6 T1smSnX5aHdglpcMwWSJSUG0KaSCTBN7baMcHaeqcJMOx06v1DhMT+V3Hp2OXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748007754; 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=xApy3CWU0UailbHTXiSaPNkVPKWdI00eDj1cYcMYNaQ=; b=YFOzLQPC4sHaq8F6/ik5GuYimAvThzzQ3okKukCuDkZeSEvQIMCJOQyi7KBgJl3sHkJPZA ch1be2i0KybmPvoQw2rRKJndY3FNvm695Z2iHVm6yNwWsl+aK+X+Lq6zUfk9KPkc1RPHD9 mocNx5vNr9yACGGDq214kUWv52b87LxRKNVeFrfpN0S4UjknKlfLSbCrP4OA49KvPHrSr/ voQh1m8FupeVI/chUW34nqGDDqBKlsGyhc4ik91tG59NTmNg4/5eTlAO/URJ1F5BB7Y61Z FehTuNPUb/qaCb4eaENKHPdHehZR0iG6/6WvTal0UvCgKS399LZS9qbMiiM/Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748007754; a=rsa-sha256; cv=none; b=Vga5+y2ROza3mNiHWpCbBDLz9W2OHm1HFCuFeVruLUCyHJNI5aQP7GWb5jiMDFZGpdORy+ lixmkRwwFzzjqW7rpeZPyW8qnkSVrmLqGZZNb7flbV1T92ikedciEhWU7rtaF0jMgLTA/x HvDaHxhfvWXJLCZTZ3UKKIFceoKaTTzx2x96ZmRepgikQpqpK7HaMpPmszBnC/JK1XsFq0 TottvsKhKv1IWKSzDJkrUDcRZbVRf54MtWZg9DOjMcpZ1RowNaTBur8VmES4Q9Hnpq0DT4 kNYiCtv2oS4I+FbEgsRFtqNQUNJpvgA9ay9vtdHMCIgY34PEN2B3gFap8FbYQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b3mYk0kHYz16tk; Fri, 23 May 2025 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54NDgXoq018584; Fri, 23 May 2025 13:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54NDgXKt018582; Fri, 23 May 2025 13:42:33 GMT (envelope-from git) Date: Fri, 23 May 2025 13:42:33 GMT Message-Id: <202505231342.54NDgXKt018582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0a86a8ace333 - main - bsdinstall: support offline pkgbase installation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a86a8ace33374b1dcf7b43eab85db2f76537522 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a86a8ace33374b1dcf7b43eab85db2f76537522 commit 0a86a8ace33374b1dcf7b43eab85db2f76537522 Author: Isaac Freund AuthorDate: 2025-05-10 22:51:06 +0000 Commit: Ed Maste 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