From owner-svn-src-head@freebsd.org Wed Sep 16 14:38:32 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 AA3019CD112; Wed, 16 Sep 2015 14:38:32 +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 94FA31DC7; Wed, 16 Sep 2015 14:38:32 +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 t8GEcTGm016251 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Wed, 16 Sep 2015 07:38:29 -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> <55F90851.2030504@freebsd.org> <55F90C9C.1010508@freebsd.org> From: Nathan Whitehorn Message-ID: <55F97EE5.4020408@freebsd.org> Date: Wed, 16 Sep 2015 07:38:29 -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: <55F90C9C.1010508@freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Sonic-CAuth: UmFuZG9tSVbZQYqrpOtMst7amkbjpXyPv05GuAQ9MT4tW/xK72lfzt/f1pEYZzjVAFnvHB27PZeqy2MpRI8cJexjzsaIDT+DMuWSEm/oQUM= X-Sonic-ID: C;bJ7PmIBc5RGmKb0U9jFv0A== M;OGQVmYBc5RGmKb0U9jFv0A== 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 14:38:32 -0000 On 09/15/15 23:30, Allan Jude wrote: > On 2015-09-16 02:12, Nathan Whitehorn wrote: >> 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 > It is setup in scripts/auto specifically because it DOES apply to both > modes (zfsboot and partedit). It applies to UFS in partedit as well. I missed that, sorry (could you add me to reviews on partitioning in the future?). There's still the issue that it doesn't apply to scripted installs. The mechanism used in gpart_ops.c also causes silent changes to disks that are already partitioned, which it should not do, since it sets these properties at the wrong time (completion of installation, rather than creation of the partition map). > The various spam messages on non-x86 are from the missing kenv? I should > be able to fix that. Yes. Could you please fix the following? 1. Set the scheme properties in partedit when the scheme is created (in gpart_create(), potentially through a callback into partedit_x86.c). 2. Come up with an autodetection scheme that does not rely on putting things in scripts/auto. Doing it there breaks scripted installs on these systems as well as interactive disk setup through sade(8). All scripts/auto is supposed to do is run the other tools in sequence and give the user some menus. 3. Only run these tests on x86 systems. They are unnecessary/harmful on other platforms and the kenvs you are checking don't exist there anyway. -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" >>> >> >