diff options
| author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2020-08-18 19:48:04 +0000 |
|---|---|---|
| committer | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2020-08-18 19:48:04 +0000 |
| commit | 277f38abffc6a8160b5044128b5b2c620fbb970c (patch) | |
| tree | 3bab41fe37fb14ef05b8dfb2b0b1235a2a47ffce /stand/i386 | |
| parent | ad7a0eb189e2aba52f2dcc6b47642a84365b90dd (diff) | |
| download | src-277f38abffc6a8160b5044128b5b2c620fbb970c.tar.gz src-277f38abffc6a8160b5044128b5b2c620fbb970c.zip | |
zfs: add an option to the bootloader to rewind the ZFS checkpoint
The checkpoints are another way of keeping the state of ZFS.
During the rewind, the pool has to be exported.
This makes checkpoints unusable when using ZFS as root.
Add the option to rewind the ZFS checkpoint at the boot time.
If checkpoint exists, a new option for rewinding a checkpoint will appear in
the bootloader menu.
We fully support boot environments.
If the rewind option is selected, the boot loader will show a list of
boot environments that existed before the checkpoint.
Reviewed by: tsoome, allanjude, kevans (ok with high-level overview)
Differential Revision: https://reviews.freebsd.org/D24920
Notes
Notes:
svn path=/head/; revision=364355
Diffstat (limited to 'stand/i386')
| -rw-r--r-- | stand/i386/loader/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 377075f100ee..d7c23ba807ad 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -363,7 +363,7 @@ extract_currdev(void) #ifdef LOADER_ZFS_SUPPORT if (new_currdev.dd.d_dev->dv_type == DEVT_ZFS) - init_zfs_bootenv(zfs_fmtdev(&new_currdev)); + init_zfs_boot_options(zfs_fmtdev(&new_currdev)); #endif env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev), |