Module Name: src Committed By: isaki Date: Sat Jun 25 14:35:59 UTC 2016
Modified Files: src/sys/arch/x68k/stand/boot: Makefile boot.c conf.c version src/sys/arch/x68k/stand/boot_ustar: Makefile src/sys/arch/x68k/stand/netboot: Makefile Removed Files: src/sys/arch/x68k/stand/netboot: conf.c version Log Message: Unify netboot and boot (into boot). Now boot becomes to be able to load the NFS kernel and netboot also becomes to be able to load the local kernel. The only difference is the default kernel which loads. I.e., netboot's default is nfs. Bump boot_ustar's BOOT_MAXSIZE. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x68k/stand/boot/Makefile \ src/sys/arch/x68k/stand/boot/boot.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/boot/conf.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/boot/version cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x68k/stand/boot_ustar/Makefile cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/netboot/Makefile cvs rdiff -u -r1.3 -r0 src/sys/arch/x68k/stand/netboot/conf.c cvs rdiff -u -r1.2 -r0 src/sys/arch/x68k/stand/netboot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.