From owner-svn-src-head@FreeBSD.ORG Mon Dec 16 21:26:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63324D5; Mon, 16 Dec 2013 21:26:16 +0000 (UTC) Received: from i3mail.icecube.wisc.edu (i3mail.icecube.wisc.edu [128.104.255.23]) by mx1.freebsd.org (Postfix) with ESMTP id 330011F37; Mon, 16 Dec 2013 21:26:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by i3mail.icecube.wisc.edu (Postfix) with ESMTP id 7648138044; Mon, 16 Dec 2013 15:26:14 -0600 (CST) X-Virus-Scanned: amavisd-new at icecube.wisc.edu Received: from i3mail.icecube.wisc.edu ([127.0.0.1]) by localhost (i3mail.icecube.wisc.edu [127.0.0.1]) (amavisd-new, port 10030) with ESMTP id 75U1GgZXJgHI; Mon, 16 Dec 2013 15:26:14 -0600 (CST) Received: from terminus.icecube.wisc.edu (terminus.icecube.wisc.edu [172.16.223.97]) by i3mail.icecube.wisc.edu (Postfix) with ESMTPSA id 51A9C38043; Mon, 16 Dec 2013 15:26:14 -0600 (CST) Message-ID: <52AF6FF6.1030909@freebsd.org> Date: Mon, 16 Dec 2013 15:26:14 -0600 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Devin Teske , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r259479 - head/usr.sbin/bsdinstall/scripts References: <201312161947.rBGJl4Jh087762@svn.freebsd.org> In-Reply-To: <201312161947.rBGJl4Jh087762@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:26:16 -0000 On 12/16/13 13:47, Devin Teske wrote: > Author: dteske > Date: Mon Dec 16 19:47:04 2013 > New Revision: 259479 > URL: http://svnweb.freebsd.org/changeset/base/259479 > > Log: > Add kern.geom.label.disk_ident.enable="0" to loader.conf(5). > > Discussed on: -current, -stable > MFC after: 3 days > > Modified: > head/usr.sbin/bsdinstall/scripts/zfsboot > > Modified: head/usr.sbin/bsdinstall/scripts/zfsboot > ============================================================================== > --- head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:44:45 2013 (r259478) > +++ head/usr.sbin/bsdinstall/scripts/zfsboot Mon Dec 16 19:47:04 2013 (r259479) > @@ -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 Uh -- what is all of this? Why are we disabling kernel functions depending on what the root filesystem is? Please don't MFC this. -Nathan