The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e69618d4bfbd0d952f86703c00a979f93e6152b
commit 3e69618d4bfbd0d952f86703c00a979f93e6152b Author: Warner Losh <[email protected]> AuthorDate: 2025-11-26 20:30:13 +0000 Commit: Warner Losh <[email protected]> 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 }
