From nobody Tue Aug 18 00:31:13 2026 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 4hP9c20lMRz6pccg for ; Tue, 18 Aug 2026 00:31:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hP9c1714qz47hF for ; Tue, 18 Aug 2026 00:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787013074; 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=HJUpmuvw9m+/YlkOg19GbkL4as0KxR35hnqVldFxNx4=; b=wnbFK9Y+8oX8t0Q/+8xgs8/pcjny03CmDI9HazyJFisTrGdFmLXT0DLrnY4NGxluORUYGe vH3lpapTUmvTkdKmRfUXV7sq2+1f0K4eYAYy5VI3mnhhmS/9iL1GN5KAvtLIQc/wyO1TvA FYQI+snhCySpH8PoSxmEpcpaJOMvAdHfC5RBFws0qxDPQdpksguWij5VfpfwrMFXbuVIun BKC+xPNWwB+0gvNJnAaWre2Y1XHo+T1suVAieskZjhf9TjRssGl2+C1Fwmub3o8jK6OzQq MhEh8gV3EDfXAJSq8zxqOb8cdBH5C5J3Hh7UhkGgMO436kY5zLpEYD8BHAOkPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787013074; a=rsa-sha256; cv=none; b=wKype7l05TNjpddJHlfVW0ThhLuWa91EbvEY2DSkzkBAtPRU/l4Q15v1EO0oI/DOfaaA2g 2drsI5V93U2QMlhvayHzy/WJWdePGyhr5PzUKX65sBHGmA35Pb2kXKqM9To3BlCjtvEBeo YdIRO0Lx35EIrzSBmBrsk/X+45WeHsaPXosTG0yrTNVBeXFopxlTWKTmIeYwprEv1BD/++ HNQ3Cv5TMiPHpQUBsJ+vBNhapqewIi56jBADgRsBnRG1c2VykXtvXuMExI+zStZi4U64hS PSXciQ4aEhwOHrVvKTIIGvLRb9OnIhstjMME2ICHrl1nfxdv8ykU8Qftw/KfKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787013074; 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=HJUpmuvw9m+/YlkOg19GbkL4as0KxR35hnqVldFxNx4=; b=c1LpDDejjXJ0dAk+SOITb0P2CEPk1KZlmxipEyJ5kUWaleRYvUe/kuIeWurgOKQnYSw4i+ +zOeln+uRwiFeL6pNQO1Jq6/+A2sSPxQZYttMYrHg0lABlaLZcTJNVblHg0Rh88Ri9ELhN zEazjPTvuSRbcFaK6HAsZWlrnwR4OdnbMLbscAskBtFanF2tDuCo0W7DgLUnF8ed1Irvht TGUUTze6Tr+beBY1p2P/iwdjpVghcF/Og9AG9z8lTxuLJGZhkLltjV/NpU/CKP2BSI3/MU cy6WKQzgE+n2rO52hK2w7IXrkeTtAAMvFQdnwoOsteSJStPLM6QYIlmUxqdGwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hP9c15rQgz5xP for ; Tue, 18 Aug 2026 00:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 424d0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 00:31:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: a43b61a1ba45 - stable/15 - makefs: Allow "legacy" as a valid ZFS mountpoint 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a43b61a1ba453c95018c0cb0042f823863e3ac69 Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 00:31:13 +0000 Message-Id: <6a83a7d1.424d0.13a90abd@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=a43b61a1ba453c95018c0cb0042f823863e3ac69 commit a43b61a1ba453c95018c0cb0042f823863e3ac69 Author: Jose Luis Duran AuthorDate: 2026-08-11 22:34:16 +0000 Commit: Jose Luis Duran CommitDate: 2026-08-18 00:30:35 +0000 makefs: Allow "legacy" as a valid ZFS mountpoint Allow "legacy" alongside "none" as a valid value for the ZFS mountpoint property, matching zfsprops(7). Reviewed by: imp, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D58781 (cherry picked from commit 59d6422d6f21fd5cf4709ce9fcada54d3925a4f6) --- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 39 +++++++++++++++++++++++++++++++ usr.sbin/makefs/zfs/dsl.c | 5 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index 0a6e5597499f..5b6c701ca291 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -654,6 +654,44 @@ multi_dataset_4_cleanup() common_cleanup } +# +# Create a legacy dataset. +# +atf_test_case multi_dataset_5 cleanup +multi_dataset_5_body() +{ + create_test_dirs + cd $TEST_INPUTS_DIR + + mkdir dir1 + echo a > dir1/a + + cd - + + atf_check $MAKEFS -s 1g -o rootpath=/ -o poolname=$ZFS_POOL_NAME \ + -o fs=${ZFS_POOL_NAME}/dir1\;canmount=noauto\;mountpoint=legacy \ + $TEST_IMAGE $TEST_INPUTS_DIR + + import_image + + atf_check -o inline:legacy\\n \ + zfs list -H -o mountpoint ${ZFS_POOL_NAME}/dir1 + + check_image_contents + + atf_check zfs set mountpoint=/dir1 ${ZFS_POOL_NAME}/dir1 + atf_check zfs mount ${ZFS_POOL_NAME}/dir1 + atf_check -o inline:${TEST_MOUNT_DIR}/dir1\\n \ + zfs list -H -o mountpoint ${ZFS_POOL_NAME}/dir1 + + # dir1/a should be part of the root dataset, not dir1. + atf_check -s not-exit:0 -e not-empty stat ${TEST_MOUNT_DIR}/dir1/a +} +multi_dataset_5_cleanup() +{ + common_cleanup +} + # # Validate handling of multiple staging directories. # @@ -1043,6 +1081,7 @@ atf_init_test_cases() atf_add_test_case multi_dataset_2 atf_add_test_case multi_dataset_3 atf_add_test_case multi_dataset_4 + atf_add_test_case multi_dataset_5 atf_add_test_case multi_staging_1 atf_add_test_case multi_staging_2 atf_add_test_case reproducible diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index 7a634272b7d4..8c336131cea0 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -103,7 +103,8 @@ dsl_dir_get_mountpoint(zfs_opt_t *zfs, zfs_dsl_dir_t *dir) char *mountpoint; if (nvlist_find_string(dir->propsnv, "mountpoint", &mountpoint) == 0) { - if (strcmp(mountpoint, "none") == 0) + if (strcmp(mountpoint, "none") == 0 || + strcmp(mountpoint, "legacy") == 0) return (NULL); } else { /* @@ -165,7 +166,7 @@ dsl_dir_set_prop(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, const char *key, errx(1, "property `%s' already set", key); if (strcmp(key, "mountpoint") == 0) { - if (strcmp(val, "none") != 0) { + if (strcmp(val, "none") != 0 && strcmp(val, "legacy") != 0) { if (val[0] != '/') errx(1, "mountpoint `%s' is not absolute", val); if (strcmp(val, zfs->rootpath) != 0 &&