Page MenuHomeFreeBSD
Files F144329904

D18029.id50581.diff
No OneTemporary
Actions

D18029.id50581.diff
View Options

Index: head/lib/libbe/be.h
===================================================================
--- head/lib/libbe/be.h
+++ head/lib/libbe/be.h
@@ -63,7 +63,7 @@
/* 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 */
Index: head/lib/libbe/be.c
===================================================================
--- head/lib/libbe/be.c
+++ head/lib/libbe/be.c
@@ -74,7 +74,7 @@
* 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 @@
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;
Index: head/lib/libbe/be_info.c
===================================================================
--- head/lib/libbe/be_info.c
+++ head/lib/libbe/be_info.c
@@ -42,7 +42,10 @@
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 @@
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);
}
Index: head/lib/libbe/libbe.3
===================================================================
--- head/lib/libbe/libbe.3
+++ head/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 @@
.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 @@
.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
Index: head/sbin/bectl/bectl.c
===================================================================
--- head/sbin/bectl/bectl.c
+++ head/sbin/bectl/bectl.c
@@ -489,12 +489,25 @@
main(int argc, char *argv[])
{
const char *command;
+ char *root;
int command_index, rc;
+ root = NULL;
if (argc < 2)
return (usage(false));
- command = argv[1];
+ if (strcmp(argv[1], "-r") == 0) {
+ if (argc < 4)
+ return (usage(false));
+ root = strdup(argv[2]);
+ command = argv[3];
+ argc -= 3;
+ argv += 3;
+ } else {
+ command = argv[1];
+ argc -= 1;
+ argv += 1;
+ }
/* Handle command aliases */
if (strcmp(command, "umount") == 0)
@@ -512,13 +525,12 @@
}
- if ((be = libbe_init()) == NULL)
+ if ((be = libbe_init(root)) == NULL)
return (-1);
libbe_print_on_error(be, true);
- /* XXX TODO: can be simplified if offset by 2 instead of one */
- rc = command_map[command_index].fn(argc-1, argv+1);
+ rc = command_map[command_index].fn(argc, argv);
libbe_close(be);
return (rc);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 8, 9:25 PM (4 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28499597
Default Alt Text
D18029.id50581.diff (4 KB)

Event Timeline