D23390.id67384.diff
No OneTemporary
Actions

Size

894 B

Referenced Files

None

Subscribers

None

D23390.id67384.diff
View Options

	Index: stand/efi/loader/main.c
	===================================================================
	--- stand/efi/loader/main.c
	+++ stand/efi/loader/main.c
	@@ -180,8 +180,17 @@
	set_currdev(const char *devname)
	{

	- env_setenv("currdev", EV_VOLATILE, devname, efi_setcurrdev, env_nounset);
	- env_setenv("loaddev", EV_VOLATILE, devname, env_noset, env_nounset);
	+ /*
	+ * Don't execute hooks here; we may need to try setting these more than
	+ * once here if we're probing for the ZFS pool we're supposed to boot.
	+ * The currdev hook is intended to just validate user input anyways,
	+ * while the loaddev hook makes it immutable once we've determined what
	+ * the proper currdev is.
	+ */
	+ env_setenv("currdev", EV_VOLATILE \| EV_NOHOOK, devname, efi_setcurrdev,
	+ env_nounset);
	+ env_setenv("loaddev", EV_VOLATILE \| EV_NOHOOK, devname, env_noset,
	+ env_nounset);
	}

	static void