From nobody Wed Nov 26 21:16:16 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 4dGsmw5NF0z6HVPt for ; Wed, 26 Nov 2025 21:16: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dGsmw2B2tz3Yb6 for ; Wed, 26 Nov 2025 21:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764191776; 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=pNW7SzH3U2rEcDCG2uk14ZfFCtJjn4z4ce0oT64bPfc=; b=vsUPUww8pLk93vljOCnc05eN5trnvisnHBBBJbPj1sOBWHEAPLd5AJv3v6lng8v4BcnOsM l0EEWQXYv3uj7enCRG6WA1zumIMrvVgdMHee242n9N4aL7CZhD1aqm7+UUQmJq06VWywfd O+ypyr2rshSztSSDbBiX0vfXvUFwUH8hl4rXtnWP/N4ek16ySP96tjL3NFqYjt/xfCN9hM 1c81mmJkHi4nNk8D6/bYwVPtZSPbM8DJ7snJR1E/re4yoB4PbwLeUp91eYM8OhjOdXcei9 jmpQ+nOPtnLO2YOPL3gTsPOV3GKYHbFWDZ+DjmYNTfXs7z/Thta94o7aeS6ztQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764191776; 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=pNW7SzH3U2rEcDCG2uk14ZfFCtJjn4z4ce0oT64bPfc=; b=AxodWontUo/xOMEpW5VuXXdqB3wSawopLocxED1giD7KB/s8/0Mvn+Ao/Snpg5JUmzKcIM WoiTeGw0UNVyjhU4XILk2IhCPy5M38tnDQnSatiRPj8ew7obhEUIpj1qoqaImRySuWoNQX Ubn05aQKHcPwjmoKGDJbzRDJZvHjSNfluyE1VCvbH9tbqU1bKZVmO0oc6a4h5vSKE1YHEB ZYgXPXMu73+AneWrjuW5kqSPJLXhhB4q4JhFHDeb+Gdi4RwfVHC0XiJu3ZmSx03xC+LqRh C7uZn55ZXlASHiDxRy08hjqgexAQg7lezEFQha2tpAQbjfr7W657eJRFkiD4dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764191776; a=rsa-sha256; cv=none; b=oplu0iAmqOF8TAkKBNv1w0RpKvxMunFxMLXK/A2ExMy52NzzrTfYjX3JbMbqtTlCAbdBV5 VFESfmTIjL0z6umzMu6aqfZMJt894w34x0bacrp2gkPyGf3715NDranMaIhu2i8FOzTq0H faG2LUJgcmQ5iItBhSnULTo76U18TYKcFeGvN+E5qiV476PKyblFPFypDC6QySdEj8fLgk d/VHEun8ixDhxdOy9qyTO5qEG3qyniAXzd46OvfiRBm2RSuQq23rin9AUhUvSYC17XHMAG D2ZsJJsD5DhwaRPVitH/aMOUG17ajjBQbj7mz0b6NktRKGb4HehiFH+mX0bGug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dGsmw1Hfbz13bM for ; Wed, 26 Nov 2025 21:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34b99 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 21:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3e69618d4bfb - main - openzfs: We are FreeBSD, not posix. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e69618d4bfbd0d952f86703c00a979f93e6152b Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 21:16:16 +0000 Message-Id: <69276e20.34b99.75998dcc@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e69618d4bfbd0d952f86703c00a979f93e6152b commit 3e69618d4bfbd0d952f86703c00a979f93e6152b Author: Warner Losh AuthorDate: 2025-11-26 20:30:13 +0000 Commit: Warner Losh CommitDate: 2025-11-26 21:01:05 +0000 openzfs: We are FreeBSD, not posix. Partially revert: https://github.com/openzfs/zfs/commit/99d7453b43dc0ef04a35e461ef14db72e1326c7c which introduced this file upstream. This causes this definition to be preferred for all builds. Make the smallest change possible to this file to change the default to FreeBSD. We're talking to the upstraem folks about the right fix. Feel free to revert this in the future, so long as `bectl activate -t` still works properly afterwards. Sponsored by: Netflix --- sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h index 44afbb6f5b6b..a4dadd83346f 100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h @@ -30,7 +30,7 @@ extern "C" { #endif -#define BOOTENV_OS BE_POSIX_VENDOR +#define BOOTENV_OS BE_FREEBSD_VENDOR #ifdef __cplusplus }