Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2009 00:40:14 -0700
From:      Kip Macy <kmacy@freebsd.org>
To:        Artis Caune <artis.caune@gmail.com>
Cc:        Lorenzo Perone <lopez.on.the.lists@yellowspace.net>, hartzell@alerce.com, Philipp Wuensche <cryx-freebsd@h3q.com>, FreeBSD Stable Mailing List <freebsd-stable@freebsd.org>
Subject:   Re: loader not working with GPT and LOADER_ZFS_SUPPORT
Message-ID:  <3c1674c90905280040k44633fb3gddb0a6fb2158671d@mail.gmail.com>
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>

next in thread | previous in thread | raw e-mail | index | archive | help
MFC'd in 192969

On Wed, May 27, 2009 at 3:31 PM, Artis Caune <artis.caune@gmail.com> wrote:
> 2009/5/28 Lorenzo Perone <lopez.on.the.lists@yellowspace.net>:
>> 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3c1674c90905280040k44633fb3gddb0a6fb2158671d>