From nobody Tue May 13 17:16:14 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 4Zxjmt3Rtlz5vfpY; Tue, 13 May 2025 17:16:14 +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 4Zxjmt2kXVz3vlf; Tue, 13 May 2025 17:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747156574; 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=ZO+AHgcp23jWsmSFHUTV7//yzUfxXsfkqi/S1yxNQNs=; b=a+XenligANXM1zC84yHg4mi9rlYOcHmkTZD03ivABaSAXLbDnJ4fNNvXEHc1QO6flRVJ3a vnveYnVy5LLHei01tbdLwF7uo4upTp4OSq/OFec+DpL6Uwk7LFsIq3f9J18djtNFDMhw67 GKqu+CwVeaM/itE/kzvAvYNLrOUjTdF0262XK7AquGzFVDcKyhqx7sPT/XFS3d87sK64rn GJhTQqnausLXODWykB8hiWj8Lpi045lvvGnbnky0OpCNq2KWEoNnVXY5J7JpuZ6CYf0bnr U5eE8YZQr3S02VJAbYCrhdOFudGbV+/ijCEoe0BFy0bBOBbuBpmCbuzKPhWBuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747156574; 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=ZO+AHgcp23jWsmSFHUTV7//yzUfxXsfkqi/S1yxNQNs=; b=ZjFW5hfePrzYaEZgi/pV1TrpUbHiaveKKPunUc2RfnG5f3pc1Wna8gYtjV5TF2hhsjdki7 Prw2pFPeUXLMfd+4y4asWGU2tptG/uBl4F48vF0Y4jUAAfM4jd82dKVRxSAqwPMxIixpAB fQai1Eup7Ooatgn4ECQI4E9Bkq1lY+L5oaocyWUWanC6/aDwo/lfO+U5qzRrVbBjLtNJQh Dwhce+wt1sWBwB34cDgIwfpiC4sZHaNTjhO2ANr4e9ZTEGmfZ3Wr08TMA5wm4aMiby83I1 Aw+GVC17RXbh+X6++lMgE+K3yslps0ciAKMau+VF18HVHcNZdgB2vyoUmiK/EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747156574; a=rsa-sha256; cv=none; b=Lz/g5oM4PbAJYuLJCn79qOh6m5XYE2k2Np4d9dJKkUmkF9N9jGu+M6ENXIRZWFcPpBuq8n 4vNa72WNCDN9stzB7+o6B9LHp2Gun2WAKOXwsk6nWY31twqhFfQOucmUN4Eno2niH6nCty cwXCjTvzEKA56lRy2iW+TJ3xxjA94d1SIxqtiJEvlCsqK7vh5POe6FthAtShJwiV2N2FIt cIM3vRcTiauFcNttOIgsiHt2R9POQ/m9iSKYmNWAFqWvwaZDsE4ZLku7N+gyuX7DqHkdGp fpMulEvWQDylOEHdHQD671kTjKLJ6B+5nwWNn/awtB60H7wff6KzbKJtfKas0w== 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 4Zxjmt2KSvzwQC; Tue, 13 May 2025 17:16:14 +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 54DHGE5k081600; Tue, 13 May 2025 17:16:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DHGE3C081597; Tue, 13 May 2025 17:16:14 GMT (envelope-from git) Date: Tue, 13 May 2025 17:16:14 GMT Message-Id: <202505131716.54DHGE3C081597@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: 89cf4b85db40 - main - release: Use NO_ROOT mode for dvd1.iso 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: 89cf4b85db4000ba23bbff73be5dfdc0abb9cf28 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=89cf4b85db4000ba23bbff73be5dfdc0abb9cf28 commit 89cf4b85db4000ba23bbff73be5dfdc0abb9cf28 Author: Ed Maste AuthorDate: 2024-12-31 14:47:33 +0000 Commit: Ed Maste CommitDate: 2025-05-13 17:01:53 +0000 release: Use NO_ROOT mode for dvd1.iso All ISO/memstick images are now built without requiring root. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50269 --- release/Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/release/Makefile b/release/Makefile index 8ca006e75f6a..4f4d0f483444 100644 --- a/release/Makefile +++ b/release/Makefile @@ -72,9 +72,7 @@ VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH} .if ${.MAKE.OS} == "FreeBSD" # For installing packages into the release media. -.if defined(NO_ROOT) PKG_ENV+= INSTALL_AS_USER=yes -.endif PKG_ENV+= ASSUME_ALWAYS_YES=yes PKG_ARGS+= -o METALOG=METALOG PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos @@ -261,12 +259,10 @@ dvd: packagesystem for dist in MANIFEST $$(ls *.txz | grep -v container); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done -.if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG for dist in MANIFEST $$(ls *.txz | grep -v container); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done -.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true @@ -282,13 +278,11 @@ dvd: 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 touch ${.TARGET} disc1-disc1 disc1-memstick: disc1 @@ -304,7 +298,7 @@ disc1.iso: disc1-disc1 cd disc1-disc1 && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ../${.TARGET} ./METALOG ${XTRADIR} dvd1.iso: dvd pkg-stage - cd dvd && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} + cd dvd && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ../${.TARGET} ./METALOG ${XTRADIR} bootonly.iso: bootonly-bootonly cd bootonly-bootonly && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ../${.TARGET} ./METALOG ${XTRADIR} @@ -324,7 +318,7 @@ packagesystem: ${DISTRIBUTIONS} pkg-stage: dvd .if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ - sh ${.CURDIR}/scripts/pkg-stage.sh ${NO_ROOT:D-N} + sh ${.CURDIR}/scripts/pkg-stage.sh -N mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/