d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbe(3): Fix BE activation promoting activated BE

Browse Source 
This allows older BEs to be destroyed as they become replaced by a BE
created from them: e.g.

bectl create -e brokenworld fixedworld
bectl activate fixedworld
bectl destroy brokenworld

Submitted by:	Shawn Webb
Approved by:	re (gjb)
Obtained from:	HardenedBSD (5948c0581e)
This commit is contained in:
Kyle Evans 2018-10-01 14:57:33 +00:00
parent c6c770d041
commit 0cadc427fd
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/libbe/be.c
View File

@ -928,8 +928,9 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary)
{
char be_path[BE_MAXPATHLEN];
char buf[BE_MAXPATHLEN];
uint64_t pool_guid;
nvlist_t *config, *vdevs;
uint64_t pool_guid;
zfs_handle_t *zhp;
int err;
be_root_concat(lbh, bootenv, be_path);
@ -961,14 +962,19 @@ be_activate(libbe_handle_t *lbh, const char *bootenv, bool temporary)
} else {
/* Obtain bootenv zpool */
err = zpool_set_prop(lbh->active_phandle, "bootfs", be_path);
switch (err) {
case 0:
return (BE_ERR_SUCCESS);
default:
/* XXX TODO correct errors */
if (err)
return (-1);
zhp = zfs_open(lbh->lzh, be_path, ZFS_TYPE_FILESYSTEM);
if (zhp == NULL)
return (-1);
err = zfs_promote(zhp);
zfs_close(zhp);
if (err)
return (-1);
}
}
return (BE_ERR_SUCCESS);
}