upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

stand/loader.efi: fix regression with ignoring nvstore

Browse source 
To read/update the boot loader nvstore, we always need to call
zfs_attach_nvstore() regardless of whether we use bootonce key
in nvstore or the bootfs property of the pool.  The call was
unintentionally left in the block of code that is processed
only when bootonce key is present.

In particular this fixes broken 'nextboot -k'.

Reviewed by:		imp
Differential Revision:	https://reviews.freebsd.org/D41795
Fixes:			e3e2681d0e

(cherry picked from commit d13550f0c9)
This commit is contained in:
Gleb Smirnoff 2023-09-11 11:04:48 -07:00 committed by Warner Losh
parent 72eb6d65ed
commit ebdd5d72ff
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stand/efi/loader/main.c
View file

@ -264,8 +264,8 @@ probe_zfs_currdev(uint64_t guid)
printf("zfs bootonce: %s\n", buf);
set_currdev(buf);
setenv("zfs-bootonce", buf, 1);
(void)zfs_attach_nvstore(&currdev);
}
(void)zfs_attach_nvstore(&currdev);
return (sanity_check_currdev());
}