Module Name:	basesrc
Committed By:	fvdl
Date:		Mon Oct  9 13:43:34 UTC 2000

Modified Files:
	basesrc/distrib/i386/floppies [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-big [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/bootfloppy-common [netbsd-1-5]:
	    Makefile.inc
	basesrc/distrib/i386/floppies/bootfloppy-tiny [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/fdset [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/fdset-common [netbsd-1-5]: Makefile.inc
	basesrc/distrib/i386/floppies/ramdisk-tiny [netbsd-1-5]: Makefile
	    Makefile.inc disktab.preinstall dot.profile list ramdiskbin.conf
Added Files:
	basesrc/distrib/i386/floppies/bootfloppy-small [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/fdset-laptop [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/kernel-ramdisk [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/kernel-rescue [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/ramdisk-big [netbsd-1-5]: Makefile
	    disktab.preinstall dot.hdprofile dot.profile list mtree.conf
	    ramdiskbin.conf termcap.mini
	basesrc/distrib/i386/floppies/ramdisk-rescuesmall [netbsd-1-5]:
	    Makefile dot.profile list mtree.conf ramdiskbin.conf termcap.mini
	basesrc/distrib/i386/floppies/ramdisk-rescuetiny [netbsd-1-5]: Makefile
	    dot.profile list mtree.conf ramdiskbin.conf termcap.mini
	basesrc/distrib/i386/floppies/ramdisk-small [netbsd-1-5]: Makefile
	    dot.hdprofile dot.profile list mtree.conf ramdiskbin.conf
	    termcap.mini
	basesrc/distrib/i386/floppies/rescue-small [netbsd-1-5]: Makefile
	basesrc/distrib/i386/floppies/rescue-tiny [netbsd-1-5]: Makefile

Log Message:
Sync with -current. Approved by jhawk. Original commit message:

Rearrange bootfloppies. The idea is that "rescue" tools go on the
floppies as long as they fit, but they are the first to be sacrificed
if space is short, and get moved to a seperate rescue floppy.

This means that the default fdset and the 2.88M image have them,
but others (the "small" and "tiny" floppies) do not.

Sysinst is also back on the "tiny" image, and tested to be working
within 4M.


To generate a diff of this commit:
cvs rdiff -r1.19 -r1.19.2.1 basesrc/distrib/i386/floppies/Makefile
cvs rdiff -r1.7.4.1 -r1.7.4.2 \
    basesrc/distrib/i386/floppies/bootfloppy-big/Makefile
cvs rdiff -r1.26.4.3 -r1.26.4.4 \
    basesrc/distrib/i386/floppies/bootfloppy-common/Makefile.inc
cvs rdiff -r0 -r1.9.2.1 \
    basesrc/distrib/i386/floppies/bootfloppy-small/Makefile
cvs rdiff -r1.5 -r1.5.4.1 \
    basesrc/distrib/i386/floppies/bootfloppy-tiny/Makefile
cvs rdiff -r1.4 -r1.4.4.1 basesrc/distrib/i386/floppies/fdset/Makefile
cvs rdiff -r1.16.4.3 -r1.16.4.4 \
    basesrc/distrib/i386/floppies/fdset-common/Makefile.inc
cvs rdiff -r0 -r1.2.2.1 basesrc/distrib/i386/floppies/fdset-laptop/Makefile
cvs rdiff -r0 -r1.1.2.1 basesrc/distrib/i386/floppies/kernel-ramdisk/Makefile
cvs rdiff -r0 -r1.2.2.1 basesrc/distrib/i386/floppies/kernel-rescue/Makefile
cvs rdiff -r0 -r1.1.2.1 basesrc/distrib/i386/floppies/ramdisk-big/Makefile \
    basesrc/distrib/i386/floppies/ramdisk-big/disktab.preinstall \
    basesrc/distrib/i386/floppies/ramdisk-big/dot.hdprofile \
    basesrc/distrib/i386/floppies/ramdisk-big/dot.profile \
    basesrc/distrib/i386/floppies/ramdisk-big/list \
    basesrc/distrib/i386/floppies/ramdisk-big/mtree.conf \
    basesrc/distrib/i386/floppies/ramdisk-big/termcap.mini
cvs rdiff -r0 -r1.2.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-big/ramdiskbin.conf
cvs rdiff -r0 -r1.2.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/Makefile
cvs rdiff -r0 -r1.1.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/dot.profile \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/list \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/mtree.conf \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/ramdiskbin.conf \
    basesrc/distrib/i386/floppies/ramdisk-rescuesmall/termcap.mini
cvs rdiff -r0 -r1.2.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/Makefile
cvs rdiff -r0 -r1.1.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/dot.profile \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/list \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/mtree.conf \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/ramdiskbin.conf \
    basesrc/distrib/i386/floppies/ramdisk-rescuetiny/termcap.mini
cvs rdiff -r0 -r1.2.2.1 basesrc/distrib/i386/floppies/ramdisk-small/Makefile \
    basesrc/distrib/i386/floppies/ramdisk-small/ramdiskbin.conf
cvs rdiff -r0 -r1.1.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-small/dot.hdprofile \
    basesrc/distrib/i386/floppies/ramdisk-small/dot.profile \
    basesrc/distrib/i386/floppies/ramdisk-small/mtree.conf \
    basesrc/distrib/i386/floppies/ramdisk-small/termcap.mini
cvs rdiff -r0 -r1.4.2.1 basesrc/distrib/i386/floppies/ramdisk-small/list
cvs rdiff -r1.1 -r1.1.2.1 basesrc/distrib/i386/floppies/ramdisk-tiny/Makefile \
    basesrc/distrib/i386/floppies/ramdisk-tiny/Makefile.inc \
    basesrc/distrib/i386/floppies/ramdisk-tiny/disktab.preinstall \
    basesrc/distrib/i386/floppies/ramdisk-tiny/list \
    basesrc/distrib/i386/floppies/ramdisk-tiny/ramdiskbin.conf
cvs rdiff -r1.3 -r1.3.2.1 \
    basesrc/distrib/i386/floppies/ramdisk-tiny/dot.profile
cvs rdiff -r0 -r1.3.2.1 basesrc/distrib/i386/floppies/rescue-small/Makefile
cvs rdiff -r0 -r1.3.2.1 basesrc/distrib/i386/floppies/rescue-tiny/Makefile

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