From owner-dev-commits-src-all@freebsd.org Thu Jul 15 22:15:47 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5356652293; Thu, 15 Jul 2021 22:15:47 +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 4GQpbl3Dygz4gBp; Thu, 15 Jul 2021 22:15:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 31AA411BC8; Thu, 15 Jul 2021 22:15:47 +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 16FMFl8n020576; Thu, 15 Jul 2021 22:15:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FMFlGG020575; Thu, 15 Jul 2021 22:15:47 GMT (envelope-from git) Date: Thu, 15 Jul 2021 22:15:47 GMT Message-Id: <202107152215.16FMFlGG020575@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 998abf5a1274 - main - nanobsd: Bump rescue size to 8GB MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 998abf5a1274609f9b74b3301dc0dabe659bd36b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 22:15:47 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=998abf5a1274609f9b74b3301dc0dabe659bd36b commit 998abf5a1274609f9b74b3301dc0dabe659bd36b Author: Warner Losh AuthorDate: 2021-07-15 22:11:15 +0000 Commit: Warner Losh CommitDate: 2021-07-15 22:15:01 +0000 nanobsd: Bump rescue size to 8GB Bump the rescue size from 1.2GB to just shy of 8GB as things have grown somewhat. Also make it possible to build rescue somewhere other than /usr/src. Sponsored by: Netflix --- tools/tools/nanobsd/rescue/common | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/tools/nanobsd/rescue/common b/tools/tools/nanobsd/rescue/common index d2a8a6de9e91..d14ad8b5af2b 100644 --- a/tools/tools/nanobsd/rescue/common +++ b/tools/tools/nanobsd/rescue/common @@ -1,15 +1,17 @@ # # $FreeBSD$ # +NANO_SRC=$(pwd) +NANO_SRC=${NANO_SRC%/tools/tools/nanobsd/rescue} +NANO_OBJ=${NANO_SRC}/../nanobsd-builds/${NANO_NAME}/obj NANO_TOOLS=`pwd` NANO_PACKAGE_DIR=`pwd`/Pkg NANO_RAM_TMPVARSIZE=40960 NANO_PMAKE="make -j 8" NANO_LABEL="rescue" NANO_RAM_TMPVARSIZE=40960 -#NANO_MEDIASIZE="8027712" -#NANO_MEDIASIZE="2097152" -NANO_MEDIASIZE="3932160" +#NANO_MEDIASIZE="3932160" +NANO_MEDIASIZE="16384000" NANO_SECTS="63" NANO_HEADS="16" NANO_IMAGES="2" @@ -19,7 +21,7 @@ NANO_DRIVE=da0 #NANO_MODULES= NANO_BOOTLOADER="boot/boot0" NANO_BOOT2CFG="" -NANO_MD_BACKING=swap +NANO_MD_BACKING=file # Options to put in make.conf during buildworld only CONF_BUILD='