system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand/boot1.efi: use the bootonce dataset as root dataset

Browse source 
Before this change we would only pass the bootonce dataset name
to the environment for the next loader, while actually reading
the next stage loader from the 'bootfs' dataset, not the bootonce
dataset.

Another problem fixed by this change is a boot from a configuration
when bootonce attribute is present, but 'bootfs' property is not set.

Reviewed by:		imp
Differential Revision:	https://reviews.freebsd.org/D40389
This commit is contained in:
Gleb Smirnoff 2023-06-08 11:14:45 -07:00
parent e3e2681d0e
commit bbc64cf66c
1 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
stand/efi/boot1/zfs_module.c
View file

@ -144,6 +144,7 @@ load(const char *filepath, dev_info_t *devinfo, void **bufp, size_t *bufsize)
struct zfsmount zmount;
dnode_phys_t dn;
struct stat st;
uint64_t rootobj;
int err;
void *buf;
@ -162,20 +163,49 @@ load(const char *filepath, dev_info_t *devinfo, void **bufp, size_t *bufsize)
return (EFI_NOT_FOUND);
}
if ((err = zfs_mount_impl(spa, 0, &zmount)) != 0) {
DPRINTF("Failed to mount pool '%s' (%d)\n", spa->spa_name, err);
return (EFI_NOT_FOUND);
if (zfs_get_bootonce_spa(spa, OS_BOOTONCE, zfs_bootonce,
sizeof(zfs_bootonce)) == 0) {
/*
* If bootonce attribute is present, use it as root dataset.
* Any attempt to use it should clear the 'once' flag. Prior
* to now, we'd not be able to clear it anyway. We don't care
* if we can't find the files to boot, or if there's a problem
* with it: we've tried to use it once we're able to mount the
* ZFS dataset.
*
* Note: the attribute is prefixed with "zfs:" and suffixed
* with ":".
*/
char *dname, *end;
if (zfs_bootonce[0] != 'z' || zfs_bootonce[1] != 'f' ||
zfs_bootonce[2] != 's' || zfs_bootonce[3] != ':' ||
(dname = strchr(&zfs_bootonce[4], '/')) == NULL ||
(end = strrchr(&zfs_bootonce[4], ':')) == NULL) {
printf("INVALID zfs bootonce: %s\n", zfs_bootonce);
*zfs_bootonce = '\0';
rootobj = 0;
} else {
dname += 1;
*end = '\0';
if (zfs_lookup_dataset(spa, dname, &rootobj) != 0) {
printf("zfs bootonce dataset %s NOT FOUND\n",
dname);
*zfs_bootonce = '\0';
rootobj = 0;
} else
printf("zfs bootonce: %s\n", zfs_bootonce);
*end = ':';
}
} else {
*zfs_bootonce = '\0';
rootobj = 0;
}
/*
* OK. We've found a filesystem. Any attempt to use it should clear the
* 'once' flag. Prior to now, we'd not be able to clear it anyway. We
* don't care if we can't find the files to boot, or if there's a
* problem with it: we've tried to use it once we're able to mount the
* ZFS dataset.
*/
*zfs_bootonce = '\0';
zfs_get_bootonce_spa(spa, OS_BOOTONCE, zfs_bootonce, sizeof(zfs_bootonce));
if ((err = zfs_mount_impl(spa, rootobj, &zmount)) != 0) {
printf("Failed to mount pool '%s' (%d)\n", spa->spa_name, err);
return (EFI_NOT_FOUND);
}
if ((err = zfs_lookup(&zmount, filepath, &dn)) != 0) {
if (err == ENOENT) {