From nobody Fri Mar 07 11:46:12 2025 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 4Z8Pd129Kjz5pC37; Fri, 07 Mar 2025 11:46:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8Pd11gmKz3jBy; Fri, 07 Mar 2025 11:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741347973; 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=IsadnqVmnRhrx5oq3rleTFRzvJY92qpiw/IZGTVvRvw=; b=cP6eXJJSnV2y5V+saV6A7x3a0h02Ud0Ae98LRmABJ0cyCw4UIQJfruP/fXACTR2Ysp6rRj cjU30gilQ9fZDzlaFQElDBCXRqsUvZP7PXS92b5UN40qgHSa7FkyqbEjly7EgJGAX2CUx1 xC4IvHTWQJF1TXieVhftSwz7a167KkhW4jwlPfWKtOYjXWk4g7knYj3jruTGzzEHlHMT7A NkiMf96c+pXn9LoypiRcQeOUHlxtRhGdT5FxeWp8pKEd+3GGNwiBblnlAzM5GlP62jc8+v hNRB0xX1jO+j54/Hy7ORyHF1W2EoK3RIvc0eDaC6Ll8CT2lXC9oDBrhoQnxztg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741347973; a=rsa-sha256; cv=none; b=iSodAKJUW01Mkk8vNpyw78xqMSi4pQc2CqRCqmjrwag8pj1Gf+UmqJufLOFnTYL0p6pHjg akIpn11g5RQvorHMxRg8qJ8pJCmdIEGxTw5YW3N0wsdgOUTMnWpgWGrO7W/lhBYHmrMJJD y/hJVat0cFlBuADYMd5f6aKRu8d8iClAlPa6STIAx71Rzk2YHAurGNMA2L+3grQJgZD9So 3zwSbeCSFfx6FN/TOxGdhFdxsWP8a1q0sJz1SomT8KjLI/uXQxQsLa1ZpI7l1cAvymBn/q 81IUSjZdmNSWCXypim5M3IKBOGt52XOulAPCoDR9EtSwAyv1o5vpBpWpBCpR6A== 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=1741347973; 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=IsadnqVmnRhrx5oq3rleTFRzvJY92qpiw/IZGTVvRvw=; b=j0+yQWcE8YR9tZhc030MFx+dVyPmsoWsduo1zSNCFoWsatBNNAD3oaqEOunODltRnKIUrX VYRgaB0WAwX36CiWZSQkADEoGdA9HA7AFncRb2RociWhQ3C94YDacC1l2CbmXSqHkHFyMC gu18rrqTGRbZcucIIvvDz9k94hw8hAH8sCctTgGQYGkhUP0Rh8L2Tpaq8/bXfAg/3Sc20y w5iAB1rwlXDGfCSPAi+llMWKJjqgZA2hwQJb4/DM51L1Nt0EMmY7jS4WW+/4kaZz4UhOIL CGNLC/NNgdsShAD2p+/Os7sBE16U4RuGvZddEaYxh+lu7Qy8W8v97IdkmvjpVQ== 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 4Z8Pd10z1WzcDP; Fri, 07 Mar 2025 11:46:13 +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 527BkCxV091308; Fri, 7 Mar 2025 11:46:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527BkCHX091305; Fri, 7 Mar 2025 11:46:12 GMT (envelope-from git) Date: Fri, 7 Mar 2025 11:46:12 GMT Message-Id: <202503071146.527BkCHX091305@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: cbba69fb5793 - main - release: Use unprivileged mode for bootonly and mini-memstick 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 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: cbba69fb5793c238cfd31697667bdff6ce1920b6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cbba69fb5793c238cfd31697667bdff6ce1920b6 commit cbba69fb5793c238cfd31697667bdff6ce1920b6 Author: Ed Maste AuthorDate: 2025-03-07 11:46:01 +0000 Commit: Ed Maste CommitDate: 2025-03-07 11:46:01 +0000 release: Use unprivileged mode for bootonly and mini-memstick This in effect always builds these targets in NO_ROOT mode, removing one more instance where release artifact builds require a privileged user (root). These artifacts are now always built the same way. Reviewed by: brooks, Pat Maddox Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48121 --- release/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index 44cd6e4bb8d5..44344c9ff20a 100644 --- a/release/Makefile +++ b/release/Makefile @@ -225,14 +225,12 @@ bootonly: packagesystem MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ - -DDB_FROM_SRC ) + -DDB_FROM_SRC -DNO_ROOT) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist -.if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.endif # Set up installation environment ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf @@ -242,13 +240,11 @@ bootonly: packagesystem echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf echo loader_menu_multi_user_prompt=\"Installer\" >> ${.TARGET}/boot/loader.conf cp ${.CURDIR}/rc.local ${.TARGET}/etc -.if defined(NO_ROOT) echo "./etc/resolv.conf type=link uname=root gname=wheel mode=0644 link=/tmp/bsdinstall_etc/resolv.conf" >> ${.TARGET}/METALOG echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/sysctl.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -.endif dvd: packagesystem # Install system @@ -307,7 +303,7 @@ dvd1.iso: dvd pkg-stage cd dvd && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} bootonly.iso: bootonly-bootonly - cd bootonly-bootonly && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} + cd bootonly-bootonly && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ../${.TARGET} ./METALOG ${XTRADIR} memstick: memstick.img memstick.img: disc1-memstick @@ -315,7 +311,7 @@ memstick.img: disc1-memstick mini-memstick: mini-memstick.img mini-memstick.img: bootonly-memstick - cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} + cd bootonly-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh ./METALOG ../${.TARGET} packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST