Module Name: src
Committed By: maya
Date: Mon Apr 22 13:27:40 UTC 2019
Modified Files:
src/distrib/amd64/cdroms/bootcd: boot.cfg.in
src/distrib/amd64/cdroms/installcd: boot.cfg.in
src/distrib/amd64/installimage: boot.cfg.in
src/distrib/amd64/uefi-installimage: boot.cfg.in
src/distrib/i386/cdroms/bootcd: boot.cfg.in
src/distrib/i386/cdroms/installcd: boot.cfg.in
src/distrib/i386/floppies/common: boot.cfg
src/distrib/i386/installimage: boot.cfg.in
Log Message:
Express more confidence in our ability to boot on hardware with ACPI
enabled and don't warn our users that it might not and already suggest
workarounds.
The ability to disable ACPI and SMP is still there, by dropping to
the boot prompt.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd/boot.cfg.in
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/installcd/boot.cfg.in
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/boot.cfg.in
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/uefi-installimage/boot.cfg.in
cvs rdiff -u -r1.9 -r1.10 src/distrib/i386/cdroms/bootcd/boot.cfg.in
cvs rdiff -u -r1.8 -r1.9 src/distrib/i386/cdroms/installcd/boot.cfg.in
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/floppies/common/boot.cfg
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/boot.cfg.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/bootcd/boot.cfg.in
diff -u src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3 src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.4
--- src/distrib/amd64/cdroms/bootcd/boot.cfg.in:1.3 Tue Jan 18 00:16:13 2011
+++ src/distrib/amd64/cdroms/bootcd/boot.cfg.in Mon Apr 22 13:27:39 2019
@@ -1,15 +1,12 @@
banner=Welcome to the NetBSD @@VERSION@@ boot-only install CD
banner================================================================================
banner=
-banner=This CD contains only the installation program. Binary sets to complete the
+banner=This media contains only the installation program. Binary sets to complete the
banner=installation must be downloaded separately. The installer can download them
banner=if this machine has a working internet connection.
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
Index: src/distrib/amd64/cdroms/installcd/boot.cfg.in
diff -u src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.3 src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.4
--- src/distrib/amd64/cdroms/installcd/boot.cfg.in:1.3 Tue Jan 18 00:16:13 2011
+++ src/distrib/amd64/cdroms/installcd/boot.cfg.in Mon Apr 22 13:27:39 2019
@@ -1,11 +1,8 @@
banner=Welcome to the NetBSD @@VERSION@@ installation CD
banner================================================================================
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
Index: src/distrib/amd64/installimage/boot.cfg.in
diff -u src/distrib/amd64/installimage/boot.cfg.in:1.1 src/distrib/amd64/installimage/boot.cfg.in:1.2
--- src/distrib/amd64/installimage/boot.cfg.in:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/installimage/boot.cfg.in Mon Apr 22 13:27:40 2019
@@ -1,12 +1,9 @@
banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
banner================================================================================
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
clear=1
Index: src/distrib/amd64/uefi-installimage/boot.cfg.in
diff -u src/distrib/amd64/uefi-installimage/boot.cfg.in:1.1 src/distrib/amd64/uefi-installimage/boot.cfg.in:1.2
--- src/distrib/amd64/uefi-installimage/boot.cfg.in:1.1 Tue Jan 24 11:16:50 2017
+++ src/distrib/amd64/uefi-installimage/boot.cfg.in Mon Apr 22 13:27:40 2019
@@ -1,12 +1,9 @@
banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
banner================================================================================
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
clear=1
Index: src/distrib/i386/cdroms/bootcd/boot.cfg.in
diff -u src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.9 src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.10
--- src/distrib/i386/cdroms/bootcd/boot.cfg.in:1.9 Sat Oct 24 06:36:39 2009
+++ src/distrib/i386/cdroms/bootcd/boot.cfg.in Mon Apr 22 13:27:40 2019
@@ -1,15 +1,12 @@
banner=Welcome to the NetBSD @@VERSION@@ boot-only install CD
banner================================================================================
banner=
-banner=This CD contains only the installation program. Binary sets to complete the
+banner=This media contains only the installation program. Binary sets to complete the
banner=installation must be downloaded separately. The installer can download them
banner=if this machine has a working internet connection.
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
Index: src/distrib/i386/cdroms/installcd/boot.cfg.in
diff -u src/distrib/i386/cdroms/installcd/boot.cfg.in:1.8 src/distrib/i386/cdroms/installcd/boot.cfg.in:1.9
--- src/distrib/i386/cdroms/installcd/boot.cfg.in:1.8 Sat Oct 24 06:36:39 2009
+++ src/distrib/i386/cdroms/installcd/boot.cfg.in Mon Apr 22 13:27:40 2019
@@ -1,11 +1,8 @@
banner=Welcome to the NetBSD @@VERSION@@ installation CD
banner================================================================================
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
Index: src/distrib/i386/floppies/common/boot.cfg
diff -u src/distrib/i386/floppies/common/boot.cfg:1.3 src/distrib/i386/floppies/common/boot.cfg:1.4
--- src/distrib/i386/floppies/common/boot.cfg:1.3 Thu Feb 10 00:43:20 2011
+++ src/distrib/i386/floppies/common/boot.cfg Mon Apr 22 13:27:40 2019
@@ -1,11 +1,6 @@
banner=NetBSD floppy diskette installation
banner================================================================================
banner=
-banner=ACPI should work on all modern and legacy hardware, however if you have
-banner=problems, please try disabling it.
-banner=
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=10
Index: src/distrib/i386/installimage/boot.cfg.in
diff -u src/distrib/i386/installimage/boot.cfg.in:1.1 src/distrib/i386/installimage/boot.cfg.in:1.2
--- src/distrib/i386/installimage/boot.cfg.in:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/installimage/boot.cfg.in Mon Apr 22 13:27:40 2019
@@ -1,12 +1,9 @@
banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
banner================================================================================
banner=
-banner=ACPI (Advanced Configuration and Power Interface) should work on all modern
-banner=and legacy hardware. However if you do encounter a problem while booting,
-banner=try disabling it and report a bug at http://www.NetBSD.org/.
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=30
clear=1
