Skip to content

bectl: Add -E flag to create an empty boot environment #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
patmaddox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bectl: Add -E flag to create an empty boot environment #1975

patmaddox wants to merge 1 commit into from
+107 −20

Conversation

@patmaddox
Copy link
Contributor

@patmaddox patmaddox commented Jan 17, 2026 •
edited
Loading

Test plan:

make -C lib/libbe
LD_LIBRARY_PATH=$(make -C lib/libbe -V .OBJDIR) make -C lib/libbe check
CFLAGS="-I$(realpath lib/libbe)" make -C sbin/bectl
PATH=$(make -C sbin/bectl -V .OBJDIR):$PATH LD_LIBRARY_PATH=$(make -C lib/libbe -V .OBJDIR) make -C sbin/bectl check

@bsdimp
Copy link
Member

bsdimp commented Jan 17, 2026

Love this. We're creating these by hand now.

@patmaddox patmaddox mentioned this pull request Jan 17, 2026
Open
@patmaddox patmaddox force-pushed the patmaddox/ynmkvowqnmmt branch from 96a6c55 to ddbe9a2 Compare January 17, 2026 20:07
kevans91
kevans91 suggested changes Jan 23, 2026
View reviewed changes
lib/libbe/be.c
return (set_error(lbh, err));

err = zfs_create(lbh->lzh, buf, ZFS_TYPE_FILESYSTEM, NULL);
return (set_error(lbh, err));
Copy link
Contributor

@kevans91 kevans91 Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

err needs to be interpreted / mapped to a libbe(3) error here before we pass it to set_error and return it

Copy link
Contributor Author

@patmaddox patmaddox Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added be_zfs_create and updated the zfs_create callsites to use it.

lib/libbe/tests/target_prog.c Outdated

libbe_print_on_error(lbh, true);

if (strcmp(argv[2], "empty") == 0)
Copy link
Contributor

@kevans91 kevans91 Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting seems off here (should be tab-indents), but maybe that's just GitHub rendering; the file's a littl inconsistent, but I can fix that in a follow-up.

Copy link
Contributor Author

@patmaddox patmaddox Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spaces-not-tabs

sbin/bectl/tests/bectl_test.sh
atf_check -e match:"cannot be combined" -s not-exit:0 \
bectl -r ${zpool}/ROOT create -E -e not-allowed empty-existing
atf_check -e match:"cannot be combined" -s not-exit:0 \
bectl -r ${zpool}/ROOT create -E -r empty-recursive
Copy link
Contributor

@kevans91 kevans91 Jan 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of these tests, probably this one, should do something to also confirm that it's actually empty / not related to an existing BE.

Copy link
Contributor Author

@patmaddox patmaddox Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added: atf_check -o inline:"-\n" zfs get -H -o value origin ${zpool}/ROOT/empty

@patmaddox patmaddox force-pushed the patmaddox/ynmkvowqnmmt branch from ddbe9a2 to 7f5e04d Compare January 31, 2026 10:50
@patmaddox
Copy link
Contributor Author

patmaddox commented Jan 31, 2026

Thanks for the feedback @kevans91 , I believe I've addressed all of the points.

@patmaddox patmaddox requested a review from kevans91 January 31, 2026 10:51
@patmaddox patmaddox force-pushed the patmaddox/ynmkvowqnmmt branch 3 times, most recently from 348dd66 to 65f61bd Compare February 1, 2026 07:26
@patmaddox patmaddox force-pushed the patmaddox/ynmkvowqnmmt branch from 65f61bd to b2143b3 Compare February 1, 2026 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kevans91 kevans91 Awaiting requested review from kevans91

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@patmaddox @bsdimp @kevans91