Module Name: src
Committed By: jdc
Date: Wed Jul 4 20:48:56 UTC 2012
Modified Files:
src/distrib/utils/sysinst [netbsd-6]: defs.h disks.c main.c
src/distrib/utils/sysinst/arch/emips [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/i386 [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/vax [netbsd-6]: md.h
Log Message:
Pull up revisions:
src/distrib/utils/sysinst/defs.h revision 1.163
src/distrib/utils/sysinst/disks.c revisions 1.125,1.126
src/distrib/utils/sysinst/main.c revisions 1.65,1.66
src/distrib/utils/sysinst/arch/emips/md.h revision 1.4
src/distrib/utils/sysinst/arch/i386/md.h revision 1.69
src/distrib/utils/sysinst/arch/vax/md.h revision 1.21
(requested by abs in ticket #386).
- Replace the CD_NAME definition with a CD_NAMES comma separate list,
the default remains "cd0a", but i386 sets "cd0a", "mcd0a" while vax
takes "cd0a", "racd0a"
- Add get_default_cdrom() to disks.c, which is called in init(). This
checks the contents of hw.disknames against CD_NAMES. The first one
found (minus partition letter) is picked, otherwise the first entry
in CD_NAMES is used
The primary beneficiary is vax systems with an MSCP but no SCSI CD
drive, which now default to (a valid) racd0a rather than an invalid
cd0a. The obvious example being simh-vax
Trying to print a function pointer as a string is likely to cause tears.
While here, don't match on the unit either
Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.
To generate a diff of this commit:
cvs rdiff -u -r1.161.2.1 -r1.161.2.2 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.123 -r1.123.2.1 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.3 -r1.3.6.1 src/distrib/utils/sysinst/arch/emips/md.h
cvs rdiff -u -r1.68 -r1.68.6.1 src/distrib/utils/sysinst/arch/i386/md.h
cvs rdiff -u -r1.20 -r1.20.6.1 src/distrib/utils/sysinst/arch/vax/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
