Page MenuHomeFreeBSD
Files F107284231

D18012.diff
No OneTemporary
Actions

D18012.diff
View Options

Index: head/lib/libbe/be.c
===================================================================
--- head/lib/libbe/be.c
+++ head/lib/libbe/be.c
@@ -29,11 +29,12 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
+#include <sys/mount.h>
#include <sys/stat.h>
-#include <sys/types.h>
+#include <sys/ucred.h>
#include <ctype.h>
-#include <kenv.h>
#include <libgen.h>
#include <libzfs_core.h>
#include <stdio.h>
@@ -55,23 +56,16 @@
* zfs_be_root set by loader(8). data is expected to be a libbe_handle_t *.
*/
static int
-be_locate_rootfs(zfs_handle_t *chkds, void *data)
+be_locate_rootfs(libbe_handle_t *lbh)
{
- libbe_handle_t *lbh;
- char *mntpoint;
+ zfs_handle_t *zfs;
- lbh = (libbe_handle_t *)data;
- if (lbh == NULL)
+ zfs = zfs_path_to_zhandle(lbh->lzh, "/", ZFS_TYPE_FILESYSTEM);
+ if (zfs == NULL)
return (1);
- mntpoint = NULL;
- if (zfs_is_mounted(chkds, &mntpoint) && strcmp(mntpoint, "/") == 0) {
- strlcpy(lbh->rootfs, zfs_get_name(chkds), sizeof(lbh->rootfs));
- free(mntpoint);
- return (1);
- } else if(mntpoint != NULL)
- free(mntpoint);
-
+ strlcpy(lbh->rootfs, zfs_get_name(zfs), sizeof(lbh->rootfs));
+ zfs_close(zfs);
return (0);
}
@@ -82,49 +76,29 @@
libbe_handle_t *
libbe_init(void)
{
- struct stat sb;
- dev_t root_dev, boot_dev;
libbe_handle_t *lbh;
- zfs_handle_t *rootds;
char *poolname, *pos;
int pnamelen;
lbh = NULL;
poolname = pos = NULL;
- rootds = NULL;
- /* Verify that /boot and / are mounted on the same filesystem */
- /* TODO: use errno here?? */
- if (stat("/", &sb) != 0)
- goto err;
-
- root_dev = sb.st_dev;
-
- if (stat("/boot", &sb) != 0)
- goto err;
-
- boot_dev = sb.st_dev;
-
- if (root_dev != boot_dev) {
- fprintf(stderr, "/ and /boot not on same device, quitting\n");
- goto err;
- }
-
if ((lbh = calloc(1, sizeof(libbe_handle_t))) == NULL)
goto err;
if ((lbh->lzh = libzfs_init()) == NULL)
goto err;
- /* Obtain path to boot environment root */
- if ((kenv(KENV_GET, "zfs_be_root", lbh->root,
- sizeof(lbh->root))) == -1)
+ /* Grab rootfs, we'll work backwards from there */
+ if (be_locate_rootfs(lbh) != 0)
goto err;
- /* Remove leading 'zfs:' if present, otherwise use value as-is */
- if (strcmp(lbh->root, "zfs:") == 0)
- strlcpy(lbh->root, strchr(lbh->root, ':') + sizeof(char),
- sizeof(lbh->root));
+ /* 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 ((pos = strchr(lbh->root, '/')) == NULL)
goto err;
@@ -144,17 +118,6 @@
sizeof(lbh->bootfs), NULL, true) != 0)
goto err;
- /* Obtain path to boot environment rootfs (currently booted) */
- /* XXX Get dataset mounted at / by kenv/GUID from mountroot? */
- if ((rootds = zfs_open(lbh->lzh, lbh->root, ZFS_TYPE_DATASET)) == NULL)
- goto err;
-
- zfs_iter_filesystems(rootds, be_locate_rootfs, lbh);
- zfs_close(rootds);
- rootds = NULL;
- if (*lbh->rootfs == '\0')
- goto err;
-
return (lbh);
err:
if (lbh != NULL) {
@@ -503,10 +466,6 @@
int
be_validate_snap(libbe_handle_t *lbh, const char *snap_name)
{
- zfs_handle_t *zfs_hdl;
- char buf[BE_MAXPATHLEN];
- char *delim_pos;
- int err = BE_ERR_SUCCESS;
if (strlen(snap_name) >= BE_MAXPATHLEN)
return (BE_ERR_PATHLEN);
@@ -515,27 +474,7 @@
ZFS_TYPE_SNAPSHOT))
return (BE_ERR_NOENT);
- strlcpy(buf, snap_name, sizeof(buf));
-
- /* Find the base filesystem of the snapshot */
- if ((delim_pos = strchr(buf, '@')) == NULL)
- return (BE_ERR_INVALIDNAME);
- *delim_pos = '\0';
-
- if ((zfs_hdl =
- zfs_open(lbh->lzh, buf, ZFS_TYPE_DATASET)) == NULL)
- return (BE_ERR_NOORIGIN);
-
- if ((err = zfs_prop_get(zfs_hdl, ZFS_PROP_MOUNTPOINT, buf,
- sizeof(buf), NULL, NULL, 0, 1)) != 0)
- err = BE_ERR_BADMOUNT;
-
- if ((err != 0) && (strncmp(buf, "/", sizeof(buf)) != 0))
- err = BE_ERR_BADMOUNT;
-
- zfs_close(zfs_hdl);
-
- return (err);
+ return (BE_ERR_SUCCESS);
}
Index: head/lib/libbe/be_info.c
===================================================================
--- head/lib/libbe/be_info.c
+++ head/lib/libbe/be_info.c
@@ -289,30 +289,11 @@
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);
if (!zfs_dataset_exists(lbh->lzh, buf, ZFS_TYPE_DATASET))
return (BE_ERR_NOENT);
- /* Also check if it's mounted at / */
- if (be_prop_list_alloc(&dsprops) != 0)
- return (BE_ERR_UNKNOWN);
-
- if (be_get_dataset_props(lbh, buf, dsprops) != 0) {
- nvlist_free(dsprops);
- return (BE_ERR_UNKNOWN);
- }
-
- if (nvlist_lookup_string(dsprops, "mountpoint", &mntpoint) == 0) {
- valid = (strcmp(mntpoint, "/") == 0);
- nvlist_free(dsprops);
- return (valid ? BE_ERR_SUCCESS : BE_ERR_BADMOUNT);
- }
-
- nvlist_free(dsprops);
- return (BE_ERR_BADMOUNT);
+ return (BE_ERR_SUCCESS);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 12, 11:28 PM (21 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15773773
Default Alt Text
D18012.diff (4 KB)

Event Timeline