MFC'd in 192969 On Wed, May 27, 2009 at 3:31 PM, Artis Caune <artis.ca...@gmail.com> wrote: > 2009/5/28 Lorenzo Perone <lopez.on.the.li...@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=log >> http://svn.freebsd.org/viewvc/base/stable/7/sys/boot/i386/libi386/biosdisk.c?view=log >> >> 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 (revision 192872) > +++ sys/boot/i386/libi386/biosdisk.c (working copy) > @@ -996,8 +996,10 @@ > od->od_boff = gp->gp_start; > > out: > - if (error) > + if (error) { > free(od->od_partitions); > + od->od_flags &= ~BD_GPTOK; > + } > return (error); > } > > @@ -1088,7 +1090,7 @@ > > switch(rw){ > case F_READ: > - DEBUG("read %d from %d to %p", blks, dblk, buf); > + DEBUG("read %d from %lld to %p", blks, dblk, buf); > > if (blks && bd_read(od, dblk, blks, buf)) { > DEBUG("read error"); > > > > > -- > Artis Caune > > Everything should be made as simple as possible, but not simpler. >
-- When bad men combine, the good must associate; else they will fall one by one, an unpitied sacrifice in a contemptible struggle. Edmund Burke _______________________________________________ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"