From nobody Tue Aug 09 18:22:46 2022 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 4M2Lyt68Btz4YmTT; Tue, 9 Aug 2022 18:22:46 +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 4M2Lyt5dqwz3QLs; Tue, 9 Aug 2022 18:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660069366; 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=+7nu+trEhlo9ZdfzZau3igW9qVjtoJEjwnTANPCoK4U=; b=D25cGTFWa0ISVJR5mWc8kViAkLSO5mZ18N8ad8nIi0aaAuZx1h+AWqZW66qCPNtU8ivWHg 8S5OGb0erJyyn3ATrDuxsOqUGawtPejST3Jfd5/Gi/IuQX8r39zFQZycm35ylJr+2k/UwM 4pGurgDbVYzMnfTHuJ1SFDB8e09OOTAVT9bjzO77Y8ONqPgeyfCF496/pDuaQMxWAq1XQ7 UqHQ7nFNVCj9zlBr8Dtzvx+92CkbziNBk8j9NuTzNwGP6hgiChf+LgHZaJqP/gQ75HdJ1k r3371NQBKTcPN7K4RUoMD5kjQUiI0HWBONFKfbc+caYyWnTZV9vixlmrO5f03A== 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 4M2Lyt4XVKzh0n; Tue, 9 Aug 2022 18:22:46 +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 279IMkm5097821; Tue, 9 Aug 2022 18:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279IMkeJ097820; Tue, 9 Aug 2022 18:22:46 GMT (envelope-from git) Date: Tue, 9 Aug 2022 18:22:46 GMT Message-Id: <202208091822.279IMkeJ097820@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: 6b6367ba8fd2 - main - release: ensure enforce_chs sysctl is 0 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 6b6367ba8fd2b29de29ce08e7432291e807c3bc0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660069366; 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=+7nu+trEhlo9ZdfzZau3igW9qVjtoJEjwnTANPCoK4U=; b=h+8kM1CNZZ89TqGHJnE+6MoEncxEIFBNU6gxsPOZeYsHDAa1BjRsNViIgd6bfdCHynnUIr gm4xtxvvB7k/ZLDiLktdJpgPpzc7HSuES3muXe88dFG9jNGuUpvbdDvFmuPOg4NTxz+RT/ hwZyfXduC5QgLyltCAFqXHMrx6xvdoZNJ8QSs32Wr1nmtlqlj5qhNSOaYDv23rd2U1CNFW LUfsOm0mwgrD1SSIvMzi+s7VxZR+rfgA0rkZ6FiBferKHt9OHiJvKMbQYuMdOiism4U5YR E7Uk/DwYLXGObvA1OiXx/b0oedKNWAGmway0H+wx9hctVMennKOlj4Ti15US+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660069366; a=rsa-sha256; cv=none; b=v4wZrM2yTj47caQ/CJ1dg7KnkUmPXWyK6A+pKjZtSEUewkhCDBGsi/NBUIEQrN7OnLq7+M //1cFub+XNabvshS1e90FFmJeTyXxnox8HvYNYsTCEu9qoLAX84SN9jWNvkaUW3FeJyVFS OHFDt52ur4T9uqTmdkAlmVsoCIh2/oHtpB+bVCShbe2z8wFLZ9f8OL4AySJEL1sc2OMeDe rL/o4EDZ4hnLAalTjqt3PCteZYWeVPFjbGfJATaFh/r8iuScx8h8rKqNnyTqQfBZnx8lUW LpruOhzECc9i9nZs3NCGesLO9h6hP1xtjFRFnMWEcFqBjgcUUjp8s7pRBPv7+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6b6367ba8fd2b29de29ce08e7432291e807c3bc0 commit 6b6367ba8fd2b29de29ce08e7432291e807c3bc0 Author: Ed Maste AuthorDate: 2022-07-19 20:47:49 +0000 Commit: Ed Maste CommitDate: 2022-08-09 18:21:34 +0000 release: ensure enforce_chs sysctl is 0 We do not want CHS-based alignment for VM or SD card release images. (Other images use makefs/mkimg, not kernel gpart and so do not depend on this sysctl.) Sponsored by: The FreeBSD Foundation Approved by: re (gjb) MFC after: 1 week --- release/tools/arm.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 25d4640cc26b..d07dbb41b48b 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -63,6 +63,10 @@ umount_loop() { } arm_create_disk() { + if [ $(sysctl -n kern.geom.part.mbr.enforce_chs) != 0 ]; then + return 1 + fi + # Create the target raw file and temporary work directory. chroot ${CHROOTDIR} gpart create -s ${PART_SCHEME} ${mddev} if [ "${PART_SCHEME}" = "GPT" ]; then