svn commit: r239066 - head/sys/boot/i386/libi386

[Dimitry Andric]

On 2012-08-05 16:37, Andrey V. Elsukov wrote:> Author: ae
> Date: Sun Aug  5 14:37:48 2012
> New Revision: 239066
> URL: http://svn.freebsd.org/changeset/base/239066
>
> Log:
>    Add offset field to the i386_devdesc structure to be compatible with
>    disk_devdesc structure. Update biosdisk driver to the new disk API.
>
> Modified:
>    head/sys/boot/i386/libi386/Makefile
>    head/sys/boot/i386/libi386/biosdisk.c
>    head/sys/boot/i386/libi386/devicename.c
>    head/sys/boot/i386/libi386/libi386.h

Though I still don't understand how, this breaks loader(8) for me.  When
I build a loader from this revision, I get the following at boot:

   /boot/config: -D -S115200

   FreeBSD/x86 boot
   Default: 0:da(0,a)/boot/loader
   boot: 0:da(0,a)/boot/loader.testConsoles: internal video/keyboard  serial port
   BIOS drive A: is disk0
   BIOS drive C: is disk1
   BIOS 638kB/1046464kB available memory

   FreeBSD/x86 bootstrap loader, Revision 1.1
   (dim at vm-dvs-dimtest1.home.andric.com, Sat Aug 11 17:14:02 CEST 2012)

   can't load 'kernel'

   Type '?' for a list of commands, 'help' for more detailed help.
   OK ls
   open '/' failed: no such file or directory
   OK lsdev
   cd devices:
   disk devices:
       disk0:   BIOS drive A:
       disk1:   BIOS drive C:
	disk1a: FreeBSD UFS
	disk1b: FreeBSD swap
   pxe devices:
   OK reboot
   Rebooting...

Building a loader from r239065 works just fine:

   /boot/config: -D -S115200

   FreeBSD/x86 boot
   Default: 0:da(0,a)/boot/loader
   boot: Consoles: internal video/keyboard  serial port
   BIOS drive A: is disk0
   BIOS drive C: is disk1
   BIOS 638kB/1046464kB available memory

   FreeBSD/x86 bootstrap loader, Revision 1.1
   (dim at vm-dvs-dimtest1.home.andric.com, Sun Aug  5 01:20:40 CEST 2012)
   Loading /boot/defaults/loader.conf
   /boot/kernel/kernel text=0xc02345 data=0x108378+0x21bad0 syms=[0x4+0xd7610+0x4+0x19e1a8]
   /boot/kernel/pty.ko text=0x920 data=0x1c8 syms=[0x4+0x3b0+0x4+0x350]
   /boot/kernel/vmmemctl.ko text=0x1cac data=0xfc+0xe4 syms=[0x4+0x5a0+0x4+0x557]
   \
   Hit [Enter] to boot immediately, or any other key for command prompt.


   Type '?' for a list of commands, 'help' for more detailed help.
   OK lsdev
   cd devices:
   disk devices:
       disk0:   BIOS drive A:
       disk1:   BIOS drive C:
	  disk1a: FFS
	  disk1b: swap
   pxe devices:
   OK ls
   /
    d  .snap
    d  dev
    d  etc
    d  cdrom
    d  dist
    d  bin
    d  boot
    d  lib
    d  libexec
    d  media
    d  mnt
    d  proc
    d  rescue
    d  root
    d  sbin
    d  tmp
    d  usr
    d  var
    d  home
    d  share
       entropy
    l  sys
       .cshrc
       boot.config
    l  compat
       COPYRIGHT
       .profile
       .sujournal
   OK boot
   [...booting normally...]

This is all in a VMware guest, with 'dangerously dedicated' disks, e.g.
/dev/da0a is root, /dev/da0b is swap.  Any idea where I should start
looking? :)