看板 DFBSD_bugs 關於我們 聯絡資訊
Francois Tigeot wrote: > On Thu, May 21, 2009 at 09:18:25PM +0300, Jordan Gordeev wrote: > >> I've adapted some fixes from FreeBSD for the booting issues that result >> in "BTX halted". >> My changes are available at >> git://leaf.dragonflybsd.org/~smtms/dragonfly.git, branch "btxhalted". >> *Everybody* should test that these changes don't break booting for them. >> Additionally, people that have seen "BTX Halted" on some of their >> computers should test to confirm that the issue is fixed. >> > > I think one of my machines may be affected by this issue. > > I would like to try your changes, but I'm lost in git land. > I tried to generate a patch from your branch; it weights 100K and I believe > many of the differences are irrelevant (many files in rc.d/) :-( > > Is there any way to just get the changes you made relative to HEAD and not > just every changes in HEAD since then ? > > Hi, Francois! The easiest way to get my changes is to create your own branch ("git branch mylocalbranch master; git checkout mylocalbranch"), then merge the "btxhalted" branch into it ("git merge smtms-on-leaf/btxhalted"). To view what changes are in branch "btxhalted", but not in master, first checkout master ("git checkout master"), then run "git log ...smtms-on-leaf/btxhalted"). Notice the two dots. Testing the changes consists of two parts: testing new boot blocks ('boot1' and 'boot2') and testing new 'loader'. To test new boot blocks you need to install them to disk using "disklabel -B -b /path/to/boot1 -s /path/to/boot2 <somedisk>". To test new 'loader', you just copy it to /boot/loader on the respective medium. To test new PXE loader, you replace 'pxeboot' (or 'pxeboot_tftp') in your TFTP-exported directory with new versions. I'm not sure what the instructions would be for building a new release ISO containing the changed 'cdboot'. I admit that it wasn't a good idea to post to users@ without including instructions on how to obtain and how to test changes. Regards, Jordan Gordeev