From nobody Tue Aug 16 01:20:16 2022 X-Original-To: dev-commits-src-branches@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 4M6Cxr5KS7z4YqgK; Tue, 16 Aug 2022 01:20:16 +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 4M6Cxr4n2Gz42fD; Tue, 16 Aug 2022 01:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660612816; 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=qGliYbcnC/Y8MnfE62PCp9IGAMvqdn+0WE8vRrCjJMU=; b=xs8IYyhzPdPO0daw4ftHq81KXzLwcgGRXOA9noR79ddkkS9X59DR9diGW8R4y1z/tvAgn/ QOKI2Emjfziyxr3az3UdBjga6clGieqgtvmWigK47Q6kwZsXdfO97ZnT8aknHv3/ALQDX7 vQs26nFvYVPuTXxvhcPaVpKmxgfSOsXpLtu00KqtviHOyrXbet+fanh2rrfH8wAcOAOn0b R5m4U0MuywR2K9OXspXe5SOI/mgwwPnIh1971ZskvtDLfv+dbCkWUIe9dU6kk5FJBYJ8Bi DoiE2FswnqqLXAg5gC7x3WeGQc8xWE6c0jHUyq1yqdVVXuR2Ppz/wRCYtbILMg== 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 4M6Cxr3pszzrDY; Tue, 16 Aug 2022 01:20:16 +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 27G1KGxk084727; Tue, 16 Aug 2022 01:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27G1KG5P084720; Tue, 16 Aug 2022 01:20:16 GMT (envelope-from git) Date: Tue, 16 Aug 2022 01:20:16 GMT Message-Id: <202208160120.27G1KG5P084720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b14067fc8d34 - stable/13 - release: ensure enforce_chs sysctl is 0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b14067fc8d342a61b2498fe846a573ff4a67e8f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660612816; 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=qGliYbcnC/Y8MnfE62PCp9IGAMvqdn+0WE8vRrCjJMU=; b=Ewae4NYdldG2kGUK9Ju/9xvsu+i/B/wLx89HrGKjZqdKvMQ12VNC16ar+8ZV9v/6L+3LX6 Qn0nvSHuVWusoeZ7xiVDHao8MGq/UGOftbivwfdgwR3OzcqIL1zuRwO//yoYMoMx4GMhip 1M7eh0G8BHjF8ExYj4B+RLv2oZ+eG/o00KM334QSKDT4++NYy1isxUSYAvYGF2F7wR6wHq 6+3mMbioWVQptgPo08M8Q2UTYBzOkF5iVHfvyMBOF0Mm+xCJlK29aBQvknXsXhqbyN9br7 aAl9uAxlSFswkseJSHpuzfvmBWqDBycC1fNDqoYhTW+72oROMMABSnxhZaHkSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660612816; a=rsa-sha256; cv=none; b=JT3wfFaEHZVb0ZYSo50OYs+ADS0Kmkr/6Cx4uB7sQSNOIOfxlpjkIYhViqmBi+IEgv/kH4 go3kuwAM225mN4zSg0/L3DGQrzvaNAYpcYPilE3ci+WXaBJCjnTyyiavtbE3ynB/wmqpQE TVxhNU2PtA7HlFdSEP+/T18AOc6kk2HJKXtYuthhXk8TvhcUQBtQMRVKasbhX8ncN0v9lY +AFSXwVjGLXtLoVc9GL6WXeI5b+k5qUNH9fsb69RmssGFXeh795F7zxKkQMGMSSLsH28Ae ajZ7Ygt33g3WCiyAlPzzNm88ilna1bBU0JZgmpwHrtMePMt19BOG0Wlf9rhjhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b14067fc8d342a61b2498fe846a573ff4a67e8f0 commit b14067fc8d342a61b2498fe846a573ff4a67e8f0 Author: Ed Maste AuthorDate: 2022-07-19 20:47:49 +0000 Commit: Ed Maste CommitDate: 2022-08-16 01:20:06 +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 (cherry picked from commit 6b6367ba8fd2b29de29ce08e7432291e807c3bc0) --- release/tools/arm.subr | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 668592740448..9758c898ca24 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