CVS commit: src

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    src
Committed By:   lukem
Date:           Wed Oct  8 04:25:46 UTC 2003

Modified Files:
        src: UPDATING
        src/distrib/amd64/floppies/common: Makefile.bootfloppy Makefile.ramdisk
            list.ramdisk
        src/distrib/i386/floppies/common: Makefile.bootfloppy Makefile.ramdisk
            list.ramdisk
        src/distrib/sets/lists/base: md.amd64 md.i386 obsolete.amd64
            obsolete.i386
        src/distrib/sets/lists/comp: mi obsolete.mi
        src/distrib/utils/sysinst: mbr.c mbr.h
        src/distrib/utils/sysinst/arch/i386: md.c menus.md
        src/doc: CHANGES
        src/sbin/disklabel: disklabel.c
        src/sbin/fdisk: fdisk.c
        src/sbin/mbrlabel: Makefile mbrlabel.c
        src/share/man/man8/man8.i386: boot.8
        src/sys/arch/amd64/amd64: autoconf.c disksubr.c
        src/sys/arch/amd64/include: disklabel.h
        src/sys/arch/arc/arc: disksubr.c
        src/sys/arch/arc/include: disklabel.h
        src/sys/arch/arm/arm: disksubr_mbr.c
        src/sys/arch/arm/include: disklabel.h
        src/sys/arch/bebox/bebox: disksubr.c
        src/sys/arch/bebox/include: disklabel.h
        src/sys/arch/cobalt/cobalt: disksubr.c
        src/sys/arch/cobalt/include: disklabel.h
        src/sys/arch/cobalt/stand/boot: wd.c wdc.c wdvar.h
        src/sys/arch/hpc/hpc: disksubr.c
        src/sys/arch/hpc/stand/include/machine: disklabel.h
        src/sys/arch/hpc/stand/libsa: winblk.c
        src/sys/arch/hpcarm/include: disklabel.h
        src/sys/arch/hpcmips/include: disklabel.h
        src/sys/arch/hpcmips/stand/libsa: winblk.c
        src/sys/arch/i386/i386: autoconf.c
        src/sys/arch/i386/include: disklabel.h
        src/sys/arch/i386/stand: Makefile.booters
        src/sys/arch/i386/stand/boot: Makefile.boot biosboot.S boot2.c version
        src/sys/arch/i386/stand/boot/biosboot: Makefile
        src/sys/arch/i386/stand/bootxx: Makefile Makefile.bootxx bootxx.S pbr.S
        src/sys/arch/i386/stand/lib: biosdisk.c bootinfo_biosgeom.c pcio.c
        src/sys/arch/i386/stand/lib/crt/bootsect: start_bootsect.S
        src/sys/arch/i386/stand/mbr: mbr.S
        src/sys/arch/i386/stand/mbr/mbr_bootsel: Makefile
        src/sys/arch/i386/stand/mbr/mbr_ext: Makefile
        src/sys/arch/mac68k/mac68k: disksubr.c
        src/sys/arch/macppc/macppc: disksubr.c
        src/sys/arch/macppc/stand/ofwboot: ofdev.c
        src/sys/arch/mvmeppc/include: disklabel.h
        src/sys/arch/mvmeppc/mvmeppc: disksubr.c
        src/sys/arch/ofppc/ofppc: disksubr.c
        src/sys/arch/ofppc/stand/ofwboot: ofdev.c
        src/sys/arch/playstation2/include: disklabel.h
        src/sys/arch/playstation2/playstation2: disksubr.c
        src/sys/arch/pmppc/include: disklabel.h
        src/sys/arch/pmppc/pmppc: disksubr.c
        src/sys/arch/prep/include: disklabel.h
        src/sys/arch/prep/prep: disksubr.c
        src/sys/arch/prep/stand/installboot: installboot.c
        src/sys/arch/prep/stand/mkbootimage: mkbootimage.c
        src/sys/arch/sandpoint/include: disklabel.h
        src/sys/arch/sandpoint/sandpoint: disksubr.c
        src/sys/arch/sbmips/include: disklabel.h
        src/sys/arch/sbmips/sbmips: disksubr.c
        src/sys/arch/sh3/include: disklabel.h
        src/sys/arch/sh3/sh3: disksubr.c
        src/sys/arch/sh5/include: disklabel.h
        src/sys/arch/shark/stand/ofwboot: ofdev.c
        src/sys/arch/x86/include: bootinfo.h
        src/sys/kern: subr_disk_mbr.c
        src/sys/sys: Makefile bootblock.h
        src/usr.sbin/installboot: installboot.8
        src/usr.sbin/installboot/arch: i386.c
Added Files:
        src/sys/arch/i386/stand/bootxx/bootxx_msdos: Makefile
Removed Files:
        src/sys/arch/i386/stand/bootxx/bootxx_dosfs: Makefile
        src/sys/arch/i386/stand/bootxx/bootxx_ufs: Makefile
        src/sys/sys: disklabel_mbr.h
        src/tools/compat/sys: disklabel_mbr.h

Log Message:
Overhaul MBR handling (part 1):

<sys/bootblock.h>:
    *   Added definitions for the Master Boot Record (MBR) used by
        a variety of systems (primarily i386), including the format
        of the BIOS Parameter Block (BPB).
        This information was cribbed from a variety of sources
        including <sys/disklabel_mbr.h> which this is a superset of.

        As part of this, some data structure elements and #defines
        were renamed to be more "namespace friendly" and consistent
        with other bootblocks and MBR documentation.
        Update all uses of the old names to the new names.

<sys/disklabel_mbr.h>:
    *   Deprecated in favor of <sys/bootblock.h> (the latter is more
        "host tool" friendly).

amd64 & i386:
    *   Renamed /usr/mdec/bootxx_dosfs to /usr/mdec/bootxx_msdos, to
        be consistent with the naming convention of the msdosfs tools.

    *   Removed /usr/mdec/bootxx_ufs, as it's equivalent to bootxx_ffsv1
        and it's confusing to have two functionally equivalent bootblocks,
        especially given that "ufs" has multiple meanings (it could be
        a synonym for "ffs", or the group of ffs/lfs/ext2fs file systems).

    *   Rework pbr.S (the first sector of bootxx_*):
            +   Ensure that BPB (bytes 11..89) and the partition table
                (bytes 446..509) do not contain code.
            +   Add support for booting from FAT partitions if BOOT_FROM_FAT
                is defined.  (Only set for bootxx_msdos).
            +   Remove "dummy" partition 3; if people want to installboot(8)
                these to the start of the disk they can use fdisk(8) to
                create a real MBR partition table...
            +   Compile with TERSE_ERROR so it fits because of the above.
                Whilst this is less user friendly, I feel it's important
                to have a valid partition table and BPB in the MBR/PBR.

    *   Renamed /usr/mdec/biosboot to /usr/mdec/boot, to be consistent
        with other platforms.

    *   Enable SUPPORT_DOSFS in /usr/mdec/boot (stage2), so that
        we can boot off FAT partitions.

    *   Crank version of /usr/mdec/boot to 3.1, and fix some of the other
        entries in the version file.

installboot(8) (i386):
    *   Read the existing MBR of the filesystem and retain the BIOS
        Parameter Block (BPB) in bytes 11..89 and the MBR partition
        table in bytes 446..509.  (Previously installboot(8) would
        trash those two sections of the MBR.)

mbrlabel(8):
    *   Use sys/lib/libkern/xlat_mbr_fstype.c instead of homegrown code
        to map the MBR partition type to the NetBSD disklabel type.

Test built "make release" for i386, and new bootblocks verified to work
(even off FAT!).


To generate a diff of this commit:
cvs rdiff -r1.96 -r1.97 src/UPDATING
cvs rdiff -r1.5 -r1.6 src/distrib/amd64/floppies/common/Makefile.bootfloppy
cvs rdiff -r1.2 -r1.3 src/distrib/amd64/floppies/common/Makefile.ramdisk \
    src/distrib/amd64/floppies/common/list.ramdisk
cvs rdiff -r1.16 -r1.17 src/distrib/i386/floppies/common/Makefile.bootfloppy
cvs rdiff -r1.20 -r1.21 src/distrib/i386/floppies/common/Makefile.ramdisk
cvs rdiff -r1.9 -r1.10 src/distrib/i386/floppies/common/list.ramdisk
cvs rdiff -r1.4 -r1.5 src/distrib/sets/lists/base/md.amd64
cvs rdiff -r1.103 -r1.104 src/distrib/sets/lists/base/md.i386
cvs rdiff -r1.2 -r1.3 src/distrib/sets/lists/base/obsolete.amd64
cvs rdiff -r1.14 -r1.15 src/distrib/sets/lists/base/obsolete.i386
cvs rdiff -r1.626 -r1.627 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.99 -r1.100 src/distrib/sets/lists/comp/obsolete.mi
cvs rdiff -r1.53 -r1.54 src/distrib/utils/sysinst/mbr.c
cvs rdiff -r1.17 -r1.18 src/distrib/utils/sysinst/mbr.h
cvs rdiff -r1.96 -r1.97 src/distrib/utils/sysinst/arch/i386/md.c
cvs rdiff -r1.7 -r1.8 src/distrib/utils/sysinst/arch/i386/menus.md
cvs rdiff -r1.206 -r1.207 src/doc/CHANGES
cvs rdiff -r1.118 -r1.119 src/sbin/disklabel/disklabel.c
cvs rdiff -r1.70 -r1.71 src/sbin/fdisk/fdisk.c
cvs rdiff -r1.4 -r1.5 src/sbin/mbrlabel/Makefile
cvs rdiff -r1.22 -r1.23 src/sbin/mbrlabel/mbrlabel.c
cvs rdiff -r1.33 -r1.34 src/share/man/man8/man8.i386/boot.8
cvs rdiff -r1.5 -r1.6 src/sys/arch/amd64/amd64/autoconf.c
cvs rdiff -r1.7 -r1.8 src/sys/arch/amd64/amd64/disksubr.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/amd64/include/disklabel.h
cvs rdiff -r1.18 -r1.19 src/sys/arch/arc/arc/disksubr.c
cvs rdiff -r1.6 -r1.7 src/sys/arch/arc/include/disklabel.h
cvs rdiff -r1.3 -r1.4 src/sys/arch/arm/arm/disksubr_mbr.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/arm/include/disklabel.h
cvs rdiff -r1.15 -r1.16 src/sys/arch/bebox/bebox/disksubr.c
cvs rdiff -r1.5 -r1.6 src/sys/arch/bebox/include/disklabel.h
cvs rdiff -r1.13 -r1.14 src/sys/arch/cobalt/cobalt/disksubr.c
cvs rdiff -r1.6 -r1.7 src/sys/arch/cobalt/include/disklabel.h
cvs rdiff -r1.1 -r1.2 src/sys/arch/cobalt/stand/boot/wd.c \
    src/sys/arch/cobalt/stand/boot/wdc.c \
    src/sys/arch/cobalt/stand/boot/wdvar.h
cvs rdiff -r1.8 -r1.9 src/sys/arch/hpc/hpc/disksubr.c
cvs rdiff -r1.1 -r1.2 src/sys/arch/hpc/stand/include/machine/disklabel.h
cvs rdiff -r1.1 -r1.2 src/sys/arch/hpc/stand/libsa/winblk.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/hpcarm/include/disklabel.h
cvs rdiff -r1.5 -r1.6 src/sys/arch/hpcmips/include/disklabel.h
cvs rdiff -r1.4 -r1.5 src/sys/arch/hpcmips/stand/libsa/winblk.c
cvs rdiff -r1.72 -r1.73 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -r1.11 -r1.12 src/sys/arch/i386/include/disklabel.h
cvs rdiff -r1.50 -r1.51 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -r1.8 -r1.9 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/stand/boot/biosboot.S \
    src/sys/arch/i386/stand/boot/version
cvs rdiff -r1.3 -r1.4 src/sys/arch/i386/stand/boot/boot2.c
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/stand/boot/biosboot/Makefile
cvs rdiff -r1.2 -r1.3 src/sys/arch/i386/stand/bootxx/Makefile
cvs rdiff -r1.8 -r1.9 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/stand/bootxx/bootxx.S
cvs rdiff -r1.7 -r1.8 src/sys/arch/i386/stand/bootxx/pbr.S
cvs rdiff -r1.1 -r0 src/sys/arch/i386/stand/bootxx/bootxx_dosfs/Makefile
cvs rdiff -r0 -r1.1 src/sys/arch/i386/stand/bootxx/bootxx_msdos/Makefile
cvs rdiff -r1.1 -r0 src/sys/arch/i386/stand/bootxx/bootxx_ufs/Makefile
cvs rdiff -r1.17 -r1.18 src/sys/arch/i386/stand/lib/biosdisk.c
cvs rdiff -r1.11 -r1.12 src/sys/arch/i386/stand/lib/bootinfo_biosgeom.c
cvs rdiff -r1.14 -r1.15 src/sys/arch/i386/stand/lib/pcio.c
cvs rdiff -r1.20 -r1.21 \
    src/sys/arch/i386/stand/lib/crt/bootsect/start_bootsect.S
cvs rdiff -r1.3 -r1.4 src/sys/arch/i386/stand/mbr/mbr.S
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/stand/mbr/mbr_bootsel/Makefile
cvs rdiff -r1.1 -r1.2 src/sys/arch/i386/stand/mbr/mbr_ext/Makefile
cvs rdiff -r1.47 -r1.48 src/sys/arch/mac68k/mac68k/disksubr.c
cvs rdiff -r1.30 -r1.31 src/sys/arch/macppc/macppc/disksubr.c
cvs rdiff -r1.12 -r1.13 src/sys/arch/macppc/stand/ofwboot/ofdev.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/mvmeppc/include/disklabel.h
cvs rdiff -r1.8 -r1.9 src/sys/arch/mvmeppc/mvmeppc/disksubr.c
cvs rdiff -r1.15 -r1.16 src/sys/arch/ofppc/ofppc/disksubr.c
cvs rdiff -r1.10 -r1.11 src/sys/arch/ofppc/stand/ofwboot/ofdev.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/playstation2/include/disklabel.h
cvs rdiff -r1.8 -r1.9 src/sys/arch/playstation2/playstation2/disksubr.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/pmppc/include/disklabel.h
cvs rdiff -r1.7 -r1.8 src/sys/arch/pmppc/pmppc/disksubr.c
cvs rdiff -r1.4 -r1.5 src/sys/arch/prep/include/disklabel.h
cvs rdiff -r1.10 -r1.11 src/sys/arch/prep/prep/disksubr.c
cvs rdiff -r1.4 -r1.5 src/sys/arch/prep/stand/installboot/installboot.c
cvs rdiff -r1.5 -r1.6 src/sys/arch/prep/stand/mkbootimage/mkbootimage.c
cvs rdiff -r1.3 -r1.4 src/sys/arch/sandpoint/include/disklabel.h
cvs rdiff -r1.8 -r1.9 src/sys/arch/sandpoint/sandpoint/disksubr.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/sbmips/include/disklabel.h
cvs rdiff -r1.8 -r1.9 src/sys/arch/sbmips/sbmips/disksubr.c
cvs rdiff -r1.4 -r1.5 src/sys/arch/sh3/include/disklabel.h
cvs rdiff -r1.15 -r1.16 src/sys/arch/sh3/sh3/disksubr.c
cvs rdiff -r1.1 -r1.2 src/sys/arch/sh5/include/disklabel.h
cvs rdiff -r1.2 -r1.3 src/sys/arch/shark/stand/ofwboot/ofdev.c
cvs rdiff -r1.2 -r1.3 src/sys/arch/x86/include/bootinfo.h
cvs rdiff -r1.3 -r1.4 src/sys/kern/subr_disk_mbr.c
cvs rdiff -r1.59 -r1.60 src/sys/sys/Makefile
cvs rdiff -r1.15 -r1.16 src/sys/sys/bootblock.h
cvs rdiff -r1.11 -r0 src/sys/sys/disklabel_mbr.h
cvs rdiff -r1.1 -r0 src/tools/compat/sys/disklabel_mbr.h
cvs rdiff -r1.30 -r1.31 src/usr.sbin/installboot/installboot.8
cvs rdiff -r1.8 -r1.9 src/usr.sbin/installboot/arch/i386.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.