From owner-svn-src-head@freebsd.org Wed Sep 16 06:22:43 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E5739CEDBD; Wed, 16 Sep 2015 06:22:43 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from c.mail.sonic.net (c.mail.sonic.net [64.142.111.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D4311D3B; Wed, 16 Sep 2015 06:22:42 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from zeppelin.tachypleus.net (75-101-50-44.static.sonic.net [75.101.50.44]) (authenticated bits=0) by c.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id t8G6CX8a012461 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Tue, 15 Sep 2015 23:12:33 -0700 Subject: Re: svn commit: r287843 - head/usr.sbin/bsdinstall/scripts To: Allan Jude , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201509160332.t8G3WSdw057340@repo.freebsd.org> From: Nathan Whitehorn Message-ID: <55F90851.2030504@freebsd.org> Date: Tue, 15 Sep 2015 23:12:33 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <201509160332.t8G3WSdw057340@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Sonic-CAuth: UmFuZG9tSVbF0c5H54ZJMhY2JNE5TPjCRI9R0OzVwz44hSNwXLhZllE55rLnHRUBaxtmpuRAAUzydcJeUEi36AX9Ky6qpyOO+/jaDdCpDuU= X-Sonic-ID: C;yDsv6zlc5RG9u70U9jFv0A== M;yJeC6zlc5RG9u70U9jFv0A== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 16 Sep 2015 06:22:43 -0000 Can we please fix this elsewhere? Like in gpart? As it is, this mechanism is super-fragile: it applies only for one of the two ways of configuring ZFS systems, and that only when running an interactive install. It's somewhat alleviated by the fact that the other cases can set up UEFI boot, but still... Putting it here also causes various spam messages when running on non-x86 systems. At the very least, it should be in zfsboot, not the auto script. That will clean this up and make the fix apply to scripted installations as well. -Nathan On 09/15/15 20:32, Allan Jude wrote: > Author: allanjude > Date: Wed Sep 16 03:32:27 2015 > New Revision: 287843 > URL: https://svnweb.freebsd.org/changeset/base/287843 > > Log: > Add a number of models to the bsdinstall GPT hack blacklist > > PR: 194359 > Approved by: bapt (mentor) > MFC after: 2 weeks > Sponsored by: ScaleEngine Inc. > Differential Revision: https://reviews.freebsd.org/D3525 > > Modified: > head/usr.sbin/bsdinstall/scripts/auto > > Modified: head/usr.sbin/bsdinstall/scripts/auto > ============================================================================== > --- head/usr.sbin/bsdinstall/scripts/auto Wed Sep 16 03:03:19 2015 (r287842) > +++ head/usr.sbin/bsdinstall/scripts/auto Wed Sep 16 03:32:27 2015 (r287843) > @@ -201,6 +201,19 @@ if f_interactive; then > ;; > esac > ;; > + "Hewlett-Packard") > + case "$sys_model" in > + "HP ProBook 4330s") > + dialog_workaround "$msg_gpt_active_fix" > + retval=$? > + f_dprintf "gpt_active_fix_prompt=[%s]" "$retval" > + if [ $retval -eq $DIALOG_OK ]; then > + export ZFSBOOT_PARTITION_SCHEME="GPT + Active" > + export WORKAROUND_GPTACTIVE=1 > + fi > + ;; > + esac > + ;; > esac > # > # Motherboard Models > @@ -208,7 +221,20 @@ if f_interactive; then > case "$sys_mb_maker" in > "Intel Corporation") > case "$sys_mb_product" in > - "DP965LT") > + "DP965LT"|"D510MO") > + dialog_workaround "$msg_gpt_active_fix" > + retval=$? > + f_dprintf "gpt_active_fix_prompt=[%s]" "$retval" > + if [ $retval -eq $DIALOG_OK ]; then > + export ZFSBOOT_PARTITION_SCHEME="GPT + Active" > + export WORKAROUND_GPTACTIVE=1 > + fi > + ;; > + esac > + ;; > + "Acer") > + case "$sys_mb_product" in > + "Veriton M6630G") > dialog_workaround "$msg_gpt_active_fix" > retval=$? > f_dprintf "gpt_active_fix_prompt=[%s]" "$retval" >