From nobody Wed May 27 00:37:08 2026 X-Original-To: dev-commits-src-main@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 4gQ9g92PK9z6f0vs for ; Wed, 27 May 2026 00:37:09 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQ9g8758Tz3LpQ for ; Wed, 27 May 2026 00:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842229; 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=OLiFquDZvwP6UV/LpH3r8zzn2ig8PN3agORi91UofII=; b=sFfZmJqLLaqIUOZvGcebVhsK4R+iS993do2tEO/J5vNhjTXq/k4rufkySKeraL0cJQx1Fs GwME4soZgLkxs4+OfDz9KahIu8vtUiJP/beb9icEg8U70Na9FURvrWIlM3pK7S8aRguEfg bT0xj6WNmzhH3F4WrgfvFjAPOMGmuxvVwr44iL3QUcpn3soL6BM2tg9yJP0wnWA8kq3t++ YNQpbgUhcm8BFBaN3FSbkSJh/t9VnfIhB1zBmsza/6Kh7aw5bnt8yGvFgSXeVGoHDWeakd YFmxS21mbdMMUIItr4hi6c3V2OIsXTxNZl5IcxIk5cwskiAaoDEiMFLjDfXprg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842229; a=rsa-sha256; cv=none; b=AAGlC65dQxYSUVcGUw3qynIQBdk5jHBvV8bfocAGNXGq5RkmYfLJYkgziIC172oE9CRUDQ FQRyRiuIeFb296ZAUvvHPShVIS15BbL0xkkhVupE0n4cmnc6TTFK3MH7pAw+ajg4vvC4jR W3+C4cxY+rjW1KkI8Gxk8Q1f/XTPF2JxQyT1jPGAgjYA30Vaujq3mZlocyh4LwFIMsh3K3 qG7K974TroxuNsep2no15whWEo0a3eiRNsC7xvejZhR2gOrsR3GesiMQQGEq91XsE37dXk sf11t1eGziR5Q+x4rPg9e3XweeOXsIFpHKuPv6C1KhIKv67t/LVDSKv9SRVzXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842229; 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=OLiFquDZvwP6UV/LpH3r8zzn2ig8PN3agORi91UofII=; b=KCQ9SzXWPulYhwDI5mm1SfVEtQpAoDOZtqVJWFYZeiMlzQN+Tut0LHq/pc7YQwbJvseRkl PmOmoNTe14irko4DinI8wWxR6Ju49vJhdf2S1OunXsBt+v3nhD+OLnHGQgcQYkJwHpAWSF H7YJVjwJneOiasCT3PVFDBbQKjKHo0KlpacA/162dsUrS3Zs0gCKZYK9x8R8p2fwxBJr8B TPi5vdHevNQrGg10Ry2utnSB4kGztJCrZjiXD8kFNvNZ7slrLXFPFWxD3KQxKI9GSB+f7+ /ADGKKJbiBQFg0aw/yIBtohosFKL9ISrWsKnsaOu0PtSokfaLkMuNQS3HnrsFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9g86dHZzcgr for ; Wed, 27 May 2026 00:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:37:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 54359982309e - main - nanobsd: Adjust the order of the flags in makefs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54359982309e63254424eea1f981215c84d2b9c6 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:37:08 +0000 Message-Id: <6a163cb4.3de71.78e8d8f2@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=54359982309e63254424eea1f981215c84d2b9c6 commit 54359982309e63254424eea1f981215c84d2b9c6 Author: Jose Luis Duran AuthorDate: 2026-05-27 00:24:26 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:24:26 +0000 nanobsd: Adjust the order of the flags in makefs The order of the flags matter in makefs(8). The -t (type) flag must come before the -o (options) flag; otherwise, the options are reset. Move the -t flag before the -o flag and remove the shim function _xxx_adjust_code_size() that was created to align to the default makefs FFS values. It effectively prevented us from generating NanoBSD images using unprivileged builds with the partitions internally aligned as intended. Reviewed by: senguptaangshuman17_gmail.com, imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57226 --- tools/tools/nanobsd/defaults.sh | 4 ++-- tools/tools/nanobsd/legacy.sh | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 6f55b28eb77f..4997812cb15f 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -718,8 +718,8 @@ nano_makefs() { image=$4 dir=$5 - makefs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \ - -R "${size}b" -T "${NANO_TIMESTAMP}" -t ffs "${image}" "${dir}" + makefs -t ffs ${options} -F "${metalog}" -N "${NANO_WORLDDIR}/etc" \ + -R "${size}b" -T "${NANO_TIMESTAMP}" "${image}" "${dir}" } # Convenient spot to work around any umount issues that your build environment diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index ed4bd493c8d7..467c7b845672 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -96,17 +96,6 @@ calculate_partitioning() { ' > ${NANO_LOG}/_.partitioning } -_xxx_adjust_code_size() -{ - # XXX adjust the CODE_SIZE value by rounding it up to - # a bsize of 32768 (DFL_BLKSIZE). - # Otherwise makefs -s will fail because of the guard - # introduced in 5ad283b3c60d. - codesize=$1 - bsize=32768 - echo $(( ((codesize + (bsize - 1)) / bsize) * bsize )) -} - create_code_slice() { pprint 2 "build code slice" pprint 3 "log: ${NANO_OBJ}/_.cs" @@ -166,7 +155,6 @@ _create_code_slice() { ( IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") - CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") echo "Writing code image..." if [ -f "${NANO_WORLDDIR}/boot/boot" ]; then @@ -295,7 +283,6 @@ _create_diskimage() { local altroot bootloader cfgimage dataimage diskimage CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") - CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") CONF_SIZE=$(awk '$3 == 3 {print $2}' "${NANO_LOG}/_.partitioning") DATA_SIZE=$(awk '$3 == 4 {print $2}' "${NANO_LOG}/_.partitioning") IMG=${NANO_DISKIMGDIR}/${NANO_IMGNAME}