From nobody Wed May 07 18:21:20 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 4Zt3Vn28K7z5v5dr; Wed, 07 May 2025 18:21:21 +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 4Zt3Vn12snz3MC7; Wed, 07 May 2025 18:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746642081; 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=F3rOZXmU5dJqlN1F/PmF/AkxjJE3ruEg1Rdonney3RQ=; b=sQehbDt4RQ6Xl5SGiJkq7/1AgWMJcVjOgQHHWz9XKPkkAICcGJ9H/RYAq7+CKa2LWwLMHL OePmUD8ty7/8EqozC0luC6PFDuez6Dv+16B7NwoQZNU+7bq3SB/0o8jgkWz7d5IQin9ax1 TQZXELR3hdYkonoTS/3Ea5pK9NgGw22GA3gTMFFHmVPqa4OCZVUwWe+YX4ZBjuV5F4aBrm WV0qmWHP5hHrKRu7qoJELa46ceYXOJviRRNj+JO0Zat0/2ANLSLC5Dke4gxD8kymIzufOq 4tOdhhp97+/OQGjXTJirrXTtuNSOd1ekT+aY+nJEBsMM+uw8bDRcsAqgZK1CMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746642081; 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=F3rOZXmU5dJqlN1F/PmF/AkxjJE3ruEg1Rdonney3RQ=; b=mibDv0Lky04AqF8Nw1SHWlfUXxcMqi1Z8uxo0r0Vcm4PmkZ5apev/Dgjo0jxRmp2ItPpDx gldTOXHXtu7Dd9j8dL6AL855mNtNS2SlKm5qrE2JvfU0n6W8/R5oA5C1tS2T3qeeONHYGH sgrjpXVvlNGYS4dT/curqqaCccbOwlHSaXA7gw5Srok6xWUtZprJVC+DP5Pft48emdtDVY YmeIwIbroD3oFh5FbVpO+Do5zvX4Nljk12ux7vSNCvZEFKJK3/IJtPNm+uD1z5tOmzhACc SxU6HOzPQ6bVpZMme0af8qvEaJU+IWklYV6wbraOaatIZZc/FQTa8OwhspAEaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746642081; a=rsa-sha256; cv=none; b=IM4jhNXkKdwofXYcIPJERLhXBKow+y1VkHKlhq5zYHNDjq/jmsY+0SehrS0BZKnFM6ud7L H8DA+GHmDBD2y1ox0939AZkac9Qb7dwIek8pliBQTcIJUAeRj+8HROxtxjywhLrlT0feQn lQamucJK3ld5E9rY0hQlg4BCwSwdilL1VKoMgtBZoHALg+M/F9+i/UhSCsJdJ3vDYvjC2/ L1Lj36Gqpz8tdjJha7eQPadEyUVQ2rzHO76GSW0qdKQigDDvcK9XQ920Wi8TfKKNp5AYBW tp6vBv6X2nKgnHMIaV5AV/mGpfNVYNqTAyybVZ4vFjS1pzSBW3KwwLzjKHXLeA== 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 4Zt3Vn0dxSzh8y; Wed, 07 May 2025 18:21:21 +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 547ILK77026983; Wed, 7 May 2025 18:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547ILK00026980; Wed, 7 May 2025 18:21:20 GMT (envelope-from git) Date: Wed, 7 May 2025 18:21:20 GMT Message-Id: <202505071821.547ILK00026980@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: 1e45fb397dce - main - release: Use unprivileged mode for disc1 and 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: 1e45fb397dcea779536b8b115fdc0cc598e5863f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1e45fb397dcea779536b8b115fdc0cc598e5863f commit 1e45fb397dcea779536b8b115fdc0cc598e5863f Author: Ed Maste AuthorDate: 2025-05-05 20:44:19 +0000 Commit: Ed Maste CommitDate: 2025-05-07 18:14:38 +0000 release: Use unprivileged mode for disc1 and memstick This same change was made for the bootonly and mini-memstick targets in commit cbba69fb5793. That uncovered some makefs bugs, which are now fixed. As there are no other known issues, extend this to disc1 and memstick images now. The change for the dvd image is waiting on PR 283387. Reviewed by: brooks, cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50179 --- release/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index 38590e364401..1489ec8dc881 100644 --- a/release/Makefile +++ b/release/Makefile @@ -179,18 +179,16 @@ disc1: 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 distfiles mkdir -p ${.TARGET}/usr/freebsd-dist for dist in MANIFEST $$(ls *.txz | grep -v container | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ 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 | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ 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 @@ -206,13 +204,11 @@ disc1: 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} bootonly: packagesystem @@ -304,7 +300,7 @@ bootonly-bootonly bootonly-memstick: bootonly release.iso: disc1.iso disc1.iso: disc1-disc1 - cd disc1-disc1 && sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ../${.TARGET} .${NO_ROOT:D/METALOG} ${XTRADIR} + 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} @@ -314,7 +310,7 @@ bootonly.iso: bootonly-bootonly memstick: memstick.img memstick.img: disc1-memstick - cd disc1-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} + cd disc1-memstick && sh ${.CURDIR}/${TARGET}/make-memstick.sh ./METALOG ../${.TARGET} mini-memstick: mini-memstick.img mini-memstick.img: bootonly-memstick