Module Name: src
Committed By: martin
Date: Tue Dec 17 13:01:39 UTC 2019
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-9]: efidisk.c
src/sys/arch/i386/stand/lib [netbsd-9]: biosdisk.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #568):
sys/arch/i386/stand/lib/biosdisk.c: revision 1.54
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.9
Do not use NAME=label syntax when label are empty
When booting sysinst from UEFI, it defaults to a GPT installation
where partition have no labels. Bootstrap used the NAME=label partition
anyway, with the result that both EFI and FFS root partition had
the same name "NAME=" and could not be distinguished. The first matching
partition for the name was used, and bootstrap looked for the kernel
in the EFI partition.
We fix that by not using NAME=label names for partition when label
is empty. In that case we revert to old syntax such as hd0b
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.49.6.3 -r1.49.6.4 src/sys/arch/i386/stand/lib/biosdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
