svn commit: r259479 - head/usr.sbin/bsdinstall/scripts

Nathan Whitehorn nwhitehorn at freebsd.org
Mon Dec 16 21:26:16 UTC 2013


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


More information about the svn-src-head mailing list