Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc Instead of explicitly specifying a kernel name, ommit to...



details:   https://anonhg.NetBSD.org/src/rev/ff97c3d17e35
branches:  trunk
changeset: 830236:ff97c3d17e35
user:      sevan <sevan%NetBSD.org@localhost>
date:      Fri Mar 02 00:25:26 2018 +0000

description:
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

diffstat:

 etc/etc.amd64/boot.cfg |  8 ++++----
 etc/etc.i386/boot.cfg  |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (30 lines):

diff -r 59ec1eb97827 -r ff97c3d17e35 etc/etc.amd64/boot.cfg
--- a/etc/etc.amd64/boot.cfg    Thu Mar 01 23:01:19 2018 +0000
+++ b/etc/etc.amd64/boot.cfg    Fri Mar 02 00:25:26 2018 +0000
@@ -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
diff -r 59ec1eb97827 -r ff97c3d17e35 etc/etc.i386/boot.cfg
--- a/etc/etc.i386/boot.cfg     Thu Mar 01 23:01:19 2018 +0000
+++ b/etc/etc.i386/boot.cfg     Fri Mar 02 00:25:26 2018 +0000
@@ -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



Home | Main Index | Thread Index | Old Index