Module Name: src Committed By: sevan Date: Fri Mar 2 00:25:26 UTC 2018
Modified Files: src/etc/etc.amd64: boot.cfg src/etc/etc.i386: boot.cfg Log Message: Instead of explicitly specifying a kernel name, ommit to allow the bootloader to iterate through the list of kernel names it is configured to try. This way there is fallback if /netbsd is not present. netbsd is the first name to be tried anyway. Issue brought up on tech-kern@ by Patrick Welche <prlw1 AT cam ac uk> where a system without /netbsd hung on boot. Suggestion by rudolf <netbsd AT eq cz> https://mail-index.netbsd.org/tech-kern/2018/02/16/msg023122.html To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/etc/etc.amd64/boot.cfg cvs rdiff -u -r1.4 -r1.5 src/etc/etc.i386/boot.cfg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/etc/etc.amd64/boot.cfg diff -u src/etc/etc.amd64/boot.cfg:1.4 src/etc/etc.amd64/boot.cfg:1.5 --- src/etc/etc.amd64/boot.cfg:1.4 Wed Dec 21 14:33:13 2011 +++ src/etc/etc.amd64/boot.cfg Fri Mar 2 00:25:26 2018 @@ -1,7 +1,7 @@ -menu=Boot normally:rndseed /var/db/entropy-file;boot netbsd -menu=Boot single user:rndseed /var/db/entropy-file;boot netbsd -s -menu=Disable ACPI:rndseed /var/db/entropy-file;boot netbsd -2 -menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot netbsd -12 +menu=Boot normally:rndseed /var/db/entropy-file;boot +menu=Boot single user:rndseed /var/db/entropy-file;boot -s +menu=Disable ACPI:rndseed /var/db/entropy-file;boot -2 +menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot -12 menu=Drop to boot prompt:prompt default=1 timeout=5 Index: src/etc/etc.i386/boot.cfg diff -u src/etc/etc.i386/boot.cfg:1.4 src/etc/etc.i386/boot.cfg:1.5 --- src/etc/etc.i386/boot.cfg:1.4 Wed Dec 21 14:33:13 2011 +++ src/etc/etc.i386/boot.cfg Fri Mar 2 00:25:26 2018 @@ -1,7 +1,7 @@ -menu=Boot normally:rndseed /var/db/entropy-file;boot netbsd -menu=Boot single user:rndseed /var/db/entropy-file;boot netbsd -s -menu=Disable ACPI:rndseed /var/db/entropy-file;boot netbsd -2 -menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot netbsd -12 +menu=Boot normally:rndseed /var/db/entropy-file;boot +menu=Boot single user:rndseed /var/db/entropy-file;boot -s +menu=Disable ACPI:rndseed /var/db/entropy-file;boot -2 +menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot -12 menu=Drop to boot prompt:prompt default=1 timeout=5