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

nextboot: Permit ZFS boot filesystems mounted at the pool's root

Browse source 
This restores nextboot -k on ZFS setups where /boot is on the root
dataset of a pool.

Reviewed by:	jrtc27, glebius
Fixes:		0c3ade2cf1 nextboot: fix nextboot -k on ZFS
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D45306
This commit is contained in:
John Baldwin 2024-05-30 05:44:55 -07:00
parent d2f1f71ec8
commit ff7de3b4d3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sbin/reboot/reboot.c
View file

@ -134,9 +134,9 @@ write_nextboot(const char *fn, const char *env, bool force)
if (zfs) {
char *slash;
if ((slash = strchr(sfs.f_mntfromname, '/')) == NULL)
E("Can't find ZFS pool name in %s", sfs.f_mntfromname);
*slash = '\0';
slash = strchr(sfs.f_mntfromname, '/');
if (slash != NULL)
*slash = '\0';
zfsbootcfg(sfs.f_mntfromname, force);
}