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

libbe(3): Check that dataset is to be mounted at / for be_exists

Browse Source 
This makes the be_exists behavior match the comments that assert that we've
already checked that the dataset derived from the BE name is set to mount at
/.

Other changes of note:
- bectl_list sees another change; changing mountpoint based on mount status
  turns out to be a bad idea, so instead make the mounted property of the
  returned nvlist the path that it's mounted at

- Always return the "mountpoint" property in "mountpoint" if it's ste
This commit is contained in:
kevans 2018-08-07 03:07:54 +00:00
parent c3bcd31273
commit 6f493e311f
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/libbe/be_info.c
View File

@ -172,10 +172,13 @@ prop_list_builder_cb(zfs_handle_t *zfs_hdl, void *data_p)
nvlist_add_string(props, "name", name);
mounted = zfs_is_mounted(zfs_hdl, &mountpoint);
nvlist_add_boolean_value(props, "mounted", mounted);
if (mounted)
nvlist_add_string(props, "mountpoint", mountpoint);
nvlist_add_string(props, "mounted", mountpoint);
if (zfs_prop_get(zfs_hdl, ZFS_PROP_MOUNTPOINT, buf, 512,
NULL, NULL, 0, 1) == 0)
nvlist_add_string(props, "mountpoint", buf);
if (zfs_prop_get(zfs_hdl, ZFS_PROP_ORIGIN, buf, 512,
NULL, NULL, 0, 1) == 0)
@ -282,12 +285,32 @@ bool
be_exists(libbe_handle_t *lbh, char *be)
{
char buf[BE_MAXPATHLEN];
nvlist_t *dsprops;
char *mntpoint;
bool valid;
be_root_concat(lbh, be, buf);
/*
* XXX TODO: check mountpoint prop and see if its /, AND that result
* with below expression.
*/
return (zfs_dataset_exists(lbh->lzh, buf, ZFS_TYPE_DATASET));
if (!zfs_dataset_exists(lbh->lzh, buf, ZFS_TYPE_DATASET))
return (false);
/* Also check if it's mounted at / */
if (be_prop_list_alloc(&dsprops) != 0) {
set_error(lbh, BE_ERR_UNKNOWN);
return (false);
}
if (be_get_dataset_props(lbh, buf, dsprops) != 0) {
nvlist_free(dsprops);
return (false);
}
if (nvlist_lookup_string(dsprops, "mountpoint", &mntpoint) == 0) {
valid = (strcmp(mntpoint, "/") == 0);
nvlist_free(dsprops);
return (valid);
}
nvlist_free(dsprops);
return (false);
}

7
sbin/bectl/bectl_list.c
View File

@ -175,7 +175,7 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
const char *oname;
char *dsname, *propstr;
int active_colsz;
boolean_t active_now, active_reboot, mounted;
boolean_t active_now, active_reboot;
dsname = NULL;
originprops = NULL;
@ -228,10 +228,7 @@ print_info(const char *name, nvlist_t *dsprops, struct printc *pc)
active_colsz--;
}
print_padding(NULL, active_colsz, pc);
if (nvlist_lookup_boolean_value(dsprops, "mounted", &mounted) != 0)
mounted = false;
if (mounted && nvlist_lookup_string(dsprops, "mountpoint",
&propstr) == 0) {
if (nvlist_lookup_string(dsprops, "mounted", &propstr) == 0) {
printf("%s", propstr);
print_padding(propstr, pc->mount_colsz, pc);
} else {