D39416.id121350.diff
No OneTemporary
Actions

Size

985 B

Referenced Files

None

Subscribers

None

D39416.id121350.diff
View Options

	diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c
	--- a/stand/kboot/hostdisk.c
	+++ b/stand/kboot/hostdisk.c
	@@ -574,7 +574,6 @@
	{
	char *devname;
	struct zfs_devdesc currdev;
	- char *buf = NULL;
	bool bootable;

	currdev.dd.d_dev = &zfs_dev;
	@@ -587,18 +586,15 @@

	bootable = sanity_check_currdev();
	if (bootable) {
	- buf = malloc(VDEV_PAD_SIZE);
	- if (buf != NULL) {
	- if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf,
	- VDEV_PAD_SIZE) == 0) {
	- printf("zfs bootonce: %s\n", buf);
	- if (setcurrdev)
	- set_currdev(buf);
	- setenv("zfs-bootonce", buf, 1);
	- }
	- free(buf);
	- (void)zfs_attach_nvstore(&currdev);
	+ char buf[VDEV_PAD_SIZE];
	+
	+ if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) {
	+ printf("zfs bootonce: %s\n", buf);
	+ if (setcurrdev)
	+ set_currdev(buf);
	+ setenv("zfs-bootonce", buf, 1);
	}
	+ (void)zfs_attach_nvstore(&currdev);
	init_zfs_boot_options(devname);
	}
	return (bootable);