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

bectl: push space-in-name check down into libbe

Browse Source 
This check was previously in `create` only, not applying to renames.  It
should really be applied at the libbe level, so that we can avoid
writing about this restriction over and over again.

While we're here: `bectl rename` always succeeds, even when it doesn't.
Start returning the error.

Reported By:	Christian McDonald <cmcdonald netgate com>
Reviewed by:	rew, jwmaag_gmail.com (earlier version)
Differential Revision:	https://reviews.freebsd.org/D34605
This commit is contained in:
Kyle Evans 2022-04-02 21:04:31 -05:00
parent 6833ac673d
commit dadb9c7093
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libbe/be.c
View File

@ -961,6 +961,17 @@ be_validate_name(libbe_handle_t *lbh, const char *name)
if (!zfs_name_valid(name, ZFS_TYPE_DATASET))
return (BE_ERR_INVALIDNAME);
/*
* ZFS allows spaces in boot environment names, but the kernel can't
* handle booting from such a dataset right now. vfs.root.mountfrom
* is defined to be a space-separated list, and there's no protocol for
* escaping whitespace in the path component of a dev:path spec. So
* while loader can handle this situation alright, it can't safely pass
* it on to mountroot.
*/
if (strchr(name, ' ') != NULL)
return (BE_ERR_INVALIDNAME);
return (BE_ERR_SUCCESS);
}

9
sbin/bectl/bectl.c
View File

@ -134,7 +134,6 @@ get_cmd_info(const char *cmd)
return (NULL);
}
static int
bectl_cmd_activate(int argc, char *argv[])
{
@ -233,10 +232,7 @@ bectl_cmd_create(int argc, char *argv[])
bootenv = *argv;
err = BE_ERR_SUCCESS;
if (strchr(bootenv, ' ') != NULL)
/* BE datasets with spaces are not bootable */
err = BE_ERR_INVALIDNAME;
else if ((atpos = strchr(bootenv, '@')) != NULL) {
if ((atpos = strchr(bootenv, '@')) != NULL) {
/*
* This is the "create a snapshot variant". No new boot
* environment is to be created here.
@ -478,7 +474,6 @@ bectl_cmd_rename(int argc, char *argv[])
dest = argv[2];
err = be_rename(be, src, dest);
switch (err) {
case BE_ERR_SUCCESS:
break;
@ -487,7 +482,7 @@ bectl_cmd_rename(int argc, char *argv[])
src, dest);
}
return (0);
return (err);
}
static int