Module Name: src Committed By: riz Date: Thu Jul 5 18:12:49 UTC 2012
Modified Files: src/sys/arch/sparc64/sparc64 [netbsd-6]: autoconf.c src/sys/arch/x86/x86 [netbsd-6]: x86_autoconf.c src/sys/arch/xen/x86 [netbsd-6]: autoconf.c src/sys/arch/zaurus/zaurus [netbsd-6]: autoconf.c src/sys/dev [netbsd-6]: vnd.c src/sys/dev/dkwedge [netbsd-6]: dk.c dkwedge_bsdlabel.c src/sys/kern [netbsd-6]: init_main.c kern_subr.c src/sys/sys [netbsd-6]: device.h disk.h Log Message: Pull up following revision(s) (requested by mlelstv in ticket #402): sys/dev/vnd.c: revision 1.221 sys/kern/init_main.c: revision 1.443 sys/kern/init_main.c: revision 1.444 sys/dev/dkwedge/dk.c: revision 1.64 sys/arch/x86/x86/x86_autoconf.c: revision 1.63 sys/arch/sparc64/sparc64/autoconf.c: revision 1.187 sys/sys/device.h: revision 1.141 sys/dev/dkwedge/dkwedge_bsdlabel.c: revision 1.17 sys/kern/kern_subr.c: revision 1.213 sys/arch/zaurus/zaurus/autoconf.c: revision 1.11 sys/arch/xen/x86/autoconf.c: revision 1.14 sys/sys/disk.h: revision 1.57 Use the label's packname to create wedge names instead of the classic device names. Fall back to classic device names when the label has an empty name or the default name 'fictitious'. autodiscover wedges Make detection of root on wedges (dk(4)) machine independent. Remove MD code for x86, xen, sparc64. Make detection of root on wedges (dk(4)) machine independent. Remove MD code for zaurus. Do not try to find the wedge we booted from if opendisk(booted_device) failed. To generate a diff of this commit: cvs rdiff -u -r1.185.2.1 -r1.185.2.2 src/sys/arch/sparc64/sparc64/autoconf.c cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/arch/x86/x86/x86_autoconf.c cvs rdiff -u -r1.13 -r1.13.18.1 src/sys/arch/xen/x86/autoconf.c cvs rdiff -u -r1.10 -r1.10.10.1 src/sys/arch/zaurus/zaurus/autoconf.c cvs rdiff -u -r1.219.8.1 -r1.219.8.2 src/sys/dev/vnd.c cvs rdiff -u -r1.62 -r1.62.8.1 src/sys/dev/dkwedge/dk.c cvs rdiff -u -r1.16 -r1.16.18.1 src/sys/dev/dkwedge/dkwedge_bsdlabel.c cvs rdiff -u -r1.441 -r1.441.2.1 src/sys/kern/init_main.c cvs rdiff -u -r1.212 -r1.212.8.1 src/sys/kern/kern_subr.c cvs rdiff -u -r1.140 -r1.140.6.1 src/sys/sys/device.h cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/sys/disk.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.