diff options
author | Kyle Evans <kevans@FreeBSD.org> | 2018-11-19 02:12:08 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2018-11-19 02:12:08 +0000 |
commit | cc624025b462a013629c52adc7db6adacf2d42f8 (patch) | |
tree | 958608b250d507458baae2b710d372f7567f7346 /lib/libbe | |
parent | 2a24f4d91173a900eb3a8ad21b2a1549d9979e33 (diff) | |
download | src-cc624025b462a013629c52adc7db6adacf2d42f8.tar.gz src-cc624025b462a013629c52adc7db6adacf2d42f8.zip |
bectl(3)/libbe(3): Allow BE root to be specified
Add an undocumented -r option preceding the bectl subcommand to specify a BE
root to operate out of. This will remain undocumented for now, as some
caveats apply:
- BEs cannot be activated in the pool that doesn't contain the rootfs
- bectl create cannot work out of the box without the -e option right now,
since it defaults to the rootfs and cross-pool cloning doesn't work like
that (IIRC)
Plumb the BE root through to libbe(3) so that some things -can- be done to
it, e.g.
bectl -r tank/ROOT create -e default upgrade
bectl -r tank/ROOT mount upgrade /mnt
this aides in some upgrade setups where rootfs is not necessarily ZFS, and
also makes it easier/possible to regression-test bectl when combined with a
file-backed zpool.
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D18029
Notes
Notes:
svn path=/head/; revision=340592
Diffstat (limited to 'lib/libbe')
-rw-r--r-- | lib/libbe/be.c | 23 | ||||
-rw-r--r-- | lib/libbe/be.h | 2 | ||||
-rw-r--r-- | lib/libbe/be_info.c | 10 | ||||
-rw-r--r-- | lib/libbe/libbe.3 | 15 |
4 files changed, 34 insertions, 16 deletions
diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 46edcebc613a..973ebb1adeb9 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -74,7 +74,7 @@ be_locate_rootfs(libbe_handle_t *lbh) * dataset, for example, zroot/ROOT. */ libbe_handle_t * -libbe_init(void) +libbe_init(const char *root) { libbe_handle_t *lbh; char *poolname, *pos; @@ -89,16 +89,21 @@ libbe_init(void) if ((lbh->lzh = libzfs_init()) == NULL) goto err; - /* Grab rootfs, we'll work backwards from there */ + /* + * Grab rootfs, we'll work backwards from there if an optional BE root + * has not been passed in. + */ if (be_locate_rootfs(lbh) != 0) goto err; - - /* Strip off the final slash from the rootfs to get the be root */ - strlcpy(lbh->root, lbh->rootfs, sizeof(lbh->root)); - pos = strrchr(lbh->root, '/'); - if (pos == NULL) - goto err; - *pos = '\0'; + if (root == NULL) { + /* Strip off the final slash from rootfs to get the be root */ + strlcpy(lbh->root, lbh->rootfs, sizeof(lbh->root)); + pos = strrchr(lbh->root, '/'); + if (pos == NULL) + goto err; + *pos = '\0'; + } else + strlcpy(lbh->root, root, sizeof(lbh->root)); if ((pos = strchr(lbh->root, '/')) == NULL) goto err; diff --git a/lib/libbe/be.h b/lib/libbe/be.h index ab43e9ba5643..265ce263cf55 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -63,7 +63,7 @@ typedef enum be_error { /* Library handling functions: be.c */ -libbe_handle_t *libbe_init(void); +libbe_handle_t *libbe_init(const char *root); void libbe_close(libbe_handle_t *); /* Bootenv information functions: be_info.c */ diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c index 8a6038009b82..e8869e6f94c8 100644 --- a/lib/libbe/be_info.c +++ b/lib/libbe/be_info.c @@ -42,7 +42,10 @@ const char * be_active_name(libbe_handle_t *lbh) { - return (strrchr(lbh->rootfs, '/') + sizeof(char)); + if (*lbh->rootfs != '\0') + return (strrchr(lbh->rootfs, '/') + sizeof(char)); + else + return (lbh->rootfs); } @@ -63,7 +66,10 @@ const char * be_nextboot_name(libbe_handle_t *lbh) { - return (strrchr(lbh->bootfs, '/') + sizeof(char)); + if (*lbh->bootfs != '\0') + return (strrchr(lbh->bootfs, '/') + sizeof(char)); + else + return (lbh->bootfs); } diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index 9e3dbef23dfe..4a637545ab48 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 31, 2018 +.Dd November 17, 2018 .Dt LIBBE 3 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .In be.h .Ft "libbe_handle_t *hdl" Ns -.Fn libbe_init void +.Fn libbe_init "const char *be_root" .Pp .Ft void .Fn libbe_close "libbe_handle_t *hdl" @@ -157,13 +157,16 @@ errno otherwise as described in .Pp The .Fn libbe_init -function initializes +function takes an optional BE root and initializes .Nm , returning a .Vt "libbe_handle_t *" on success, or .Dv NULL on error. +If a BE root is supplied, +.Nm +will only operate out of that pool and BE root. An error may occur if: .Bl -column .It /boot and / are not on the same filesystem and device, @@ -184,11 +187,15 @@ invalidating the handle in the process. .Pp The .Fn be_active_name -function returns the name of the currently booted boot environment, +function returns the name of the currently booted boot environment. +This boot environment may not belong to the same BE root as the root libbe +is operating on! .Pp The .Fn be_active_path function returns the full path of the currently booted boot environment. +This boot environment may not belong to the same BE root as the root libbe +is operating on! .Pp The .Fn be_nextboot_name |