From owner-freebsd-stable@FreeBSD.ORG Thu May 28 07:40:16 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4DD231065679 for ; Thu, 28 May 2009 07:40:16 +0000 (UTC) (envelope-from mat.macy@gmail.com) Received: from yw-out-2324.google.com (yw-out-2324.google.com [74.125.46.30]) by mx1.freebsd.org (Postfix) with ESMTP id ECA9E8FC08 for ; Thu, 28 May 2009 07:40:15 +0000 (UTC) (envelope-from mat.macy@gmail.com) Received: by yw-out-2324.google.com with SMTP id 9so2827265ywe.13 for ; Thu, 28 May 2009 00:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=Es/wo+cY8obGZKSpz9xp7W9+3CJovuobotJ9qpuAnpo=; b=HFtFmhPFQ9ViutNhdP5e1L0spxSr5fveA8PotQ4aJGZpKAOR1PHOYe8ZB52EZowr5r MWL9FkokwECdwePNic6VzTz97KHsTlhl4hWXPeqzGdLVRbI6L9na9ioqzfYEQBWD81N1 uiYJGJof2O6HKUk8z+k9vRJNzwzc9mrirTDp8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=fZejvEVqwKw+kXIMly1no5pud13THV1Pe2BUph4NNkMDmlpkYi/RFN4U9TbUf9WNwa iSV42JCMIq1ZQF268N1UOdwl9q1kKrnPyKXUZU/ehK2e3rjnmz79Q65vxVxmFA9Z/crv FiRTd1qtrywK4le/wwSDMwXcI48jhI75c4Fpw= MIME-Version: 1.0 Sender: mat.macy@gmail.com Received: by 10.100.141.16 with SMTP id o16mr383124and.152.1243496414978; Thu, 28 May 2009 00:40:14 -0700 (PDT) In-Reply-To: <9e20d71e0905271531v240a56cwf7c39d6083331550@mail.gmail.com> References: <4A1BED8C.1070408@h3q.com> <9e20d71e0905260854t1c731f68g3965c3406dc304c5@mail.gmail.com> <18972.5227.526290.349958@already.dhcp.gene.com> <6ADD3B12-380C-4BFD-AA46-778DF1768453@verweg.com> <9e20d71e0905270548j376fe604uffff66988e9b7ebe@mail.gmail.com> <7BDF3D7A-4EA2-499A-9481-A88F3CA285BC@yellowspace.net> <9e20d71e0905271531v240a56cwf7c39d6083331550@mail.gmail.com> Date: Thu, 28 May 2009 00:40:14 -0700 X-Google-Sender-Auth: c6d73c306c37b0a0 Message-ID: <3c1674c90905280040k44633fb3gddb0a6fb2158671d@mail.gmail.com> From: Kip Macy To: Artis Caune Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Lorenzo Perone , hartzell@alerce.com, Philipp Wuensche , FreeBSD Stable Mailing List Subject: Re: loader not working with GPT and LOADER_ZFS_SUPPORT X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 07:40:16 -0000 MFC'd in 192969 On Wed, May 27, 2009 at 3:31 PM, Artis Caune wrote: > 2009/5/28 Lorenzo Perone : >> Hi, I'm a bit confused: >> >> I can't find this change (rev 185095) in the stable log, yet stable has = some >> other >> recent changes related to the current posts (in turn commited also to >> head)... >> >> http://svn.freebsd.org/viewvc/base/head/sys/boot/i386/libi386/biosdisk.c= ?view=3Dlog >> http://svn.freebsd.org/viewvc/base/stable/7/sys/boot/i386/libi386/biosdi= sk.c?view=3Dlog >> >> maybe I'm misunderstanding how things eventually get ingto -stable, >> however, which revision to use now for a peaceful world & boot? :) >> >> I'll go for the -head version for my next try.. > > > It's not merged to stable yet. You should apply r185095 diff by hand. > Just edit "sys/boot/i386/libi386/biosdisk.c" and change: > > > --- sys/boot/i386/libi386/biosdisk.c =A0 =A0(revision 192872) > +++ sys/boot/i386/libi386/biosdisk.c =A0 =A0(working copy) > @@ -996,8 +996,10 @@ > =A0 =A0 od->od_boff =3D gp->gp_start; > > =A0out: > - =A0 =A0if (error) > + =A0 =A0if (error) { > =A0 =A0 =A0 =A0free(od->od_partitions); > + =A0 =A0 =A0 od->od_flags &=3D ~BD_GPTOK; > + =A0 =A0} > =A0 =A0 return (error); > =A0} > > @@ -1088,7 +1090,7 @@ > > =A0 =A0 switch(rw){ > =A0 =A0 case F_READ: > - =A0 =A0 =A0 DEBUG("read %d from %d to %p", blks, dblk, buf); > + =A0 =A0 =A0 DEBUG("read %d from %lld to %p", blks, dblk, buf); > > =A0 =A0 =A0 =A0if (blks && bd_read(od, dblk, blks, buf)) { > =A0 =A0 =A0 =A0 =A0 =A0DEBUG("read error"); > > > > > -- > Artis Caune > > =A0 =A0Everything should be made as simple as possible, but not simpler. > --=20 When bad men combine, the good must associate; else they will fall one by one, an unpitied sacrifice in a contemptible struggle. Edmund Burke