From ee482f2c28e5675eba7f868427a4750c3121c57a Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 16 Dec 2013 19:47:04 +0000
Subject: [PATCH] Add kern.geom.label.disk_ident.enable="0" to loader.conf(5).

Discussed on:	-current, -stable
MFC after:	3 days
---
 usr.sbin/bsdinstall/scripts/zfsboot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 62d51d415aa3..61e896acd929 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -1159,6 +1159,9 @@ zfs_create_boot()
 	             $BSDINSTALL_TMPETC/rc.conf.zfs || return $FAILURE
 	f_eval_catch $funcname echo "$ECHO_APPEND" 'zfs_load=\"YES\"' \
 	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+	f_eval_catch $funcname echo "$ECHO_APPEND" \
+	             'kern.geom.label.disk_ident.enable=\"0\"' \
+	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 
 	# We're all done unless we should go on for boot pool
 	[ "$ZFSBOOT_BOOT_POOL" ] || return $SUCCESS