Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Aug 2020 17:23:33 +0000 (UTC)
From:      Matt Macy <mmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r364773 - head/stand/userboot/userboot
Message-ID:  <202008251723.07PHNXU1004009@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmacy
Date: Tue Aug 25 17:23:33 2020
New Revision: 364773
URL: https://svnweb.freebsd.org/changeset/base/364773

Log:
  Fix userboot after r364355
  
  r364355 replaced init_zfs_bootenv with init_zfs_boot_options and
  neglected to update userboot in the process.

Modified:
  head/stand/userboot/userboot/main.c

Modified: head/stand/userboot/userboot/main.c
==============================================================================
--- head/stand/userboot/userboot/main.c	Tue Aug 25 17:19:15 2020	(r364772)
+++ head/stand/userboot/userboot/main.c	Tue Aug 25 17:23:33 2020	(r364773)
@@ -232,7 +232,7 @@ extract_currdev(void)
 		bzero(&zdev, sizeof(zdev));
 		zdev.dd.d_dev = &zfs_dev;
 		
-		init_zfs_bootenv(zfs_fmtdev(&zdev));
+		init_zfs_boot_options(zfs_fmtdev(&zdev));
 		dd = &zdev.dd;
 	} else
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008251723.07PHNXU1004009>