--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,
attached is a first cut at updating distrib/notes to the new cdrom boot
scheme, mentionning ACPI and related fallouts. My troff knowlege is
very limited so the formatting can probably be improved too.

Please comment (on both the troff, and the content :). Do you see anything
else that should be said on this topic ?

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 26 ans d'experience feront toujours la difference
--

--u3/rZRmxL6MmkK24
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: amd64/whatis
===================================================================
RCS file: /cvsroot/src/distrib/notes/amd64/whatis,v
retrieving revision 1.1
diff -u -r1.1 whatis
--- amd64/whatis	21 Aug 2005 18:35:26 -0000	1.1
+++ amd64/whatis	16 May 2007 17:05:08 -0000
@@ -1,2 +1,12 @@
 .\"$NetBSD: whatis,v 1.1 2005/08/21 18:35:26 riz Exp $
 .
+.Pp
+Some (but not all!) notable \*M-specific improvements include:
+.(bullet
+Default kernels now have ACPI enabled by default. If this cause problems
+on your hardware, use userconf and
+.Ic disable acpi
+to boot without ACPI support.
+.It
+TBD
+.bullet)
Index: common/contents
===================================================================
RCS file: /cvsroot/src/distrib/notes/common/contents,v
retrieving revision 1.124
diff -u -r1.124 contents
--- common/contents	8 Apr 2007 09:35:24 -0000	1.124
+++ common/contents	16 May 2007 17:05:08 -0000
@@ -277,11 +277,15 @@
 .		It Pa bootfs/
 Netbootable RAM disk kernel and the file system in the RAM disk; see below.
 .\}
-.if \n[alpha]:\n[amiga]:\n[atari]:\n[bebox]:\n[i386]:\n[news68k]:\
+.if \n[alpha]:\n[amd64]:\n[amiga]:\n[atari]:\n[bebox]:\n[i386]:\n[news68k]:\
 \n[newsmips]:\n[pc532]:\n[sparc]:\n[x68k]:\n[prep]:\n[sandpoint] \{\
 .		It Pa floppy/
 \*M boot and installation floppies; see below.
 .\}
+.if \n[i386]:\n[amd64] \{\
+.		It Pa cdrom/
+\*M bootable cdrom images; see below.
+.\}
 .
 .if \n[alpha] \{\
 .		It Pa diskimage/
@@ -325,7 +329,7 @@
 \*M miniroot file system image; see below.
 .\}
 .
-.if !\n[cats]:\n[evbppc]:\n[mvme68k]:\n[macppc]:\n[sgimips]:\n[sparc]:\n[xen]:\n[amd64] \{\
+.if !\n[cats]:\n[evbppc]:\n[mvme68k]:\n[macppc]:\n[sgimips]:\n[sparc]:\n[xen] \{\
 .		It Pa misc/
 .
 .ie \n[alpha] \{\
Index: common/main
===================================================================
RCS file: /cvsroot/src/distrib/notes/common/main,v
retrieving revision 1.339
diff -u -r1.339 main
--- common/main	10 May 2007 18:34:02 -0000	1.339
+++ common/main	16 May 2007 17:05:08 -0000
@@ -117,15 +117,21 @@
 .if \n[i386]:\n[amd64] \{\
 appropriate pair of boot floppy images from the
 .Pa \*M/installation/floppy/
-directory, or a CD-ROM image.
+directory, or a CD-ROM image (the images from
+.Pa \*M/installation/cdrom/
+are bootable, but do no containt binary sets).
 Most people will need the
 .Pa boot1.fs
 and
 .Pa boot2.fs
+or
+.Pa boot.iso
 images for VGA console installation, or the
 .Pa boot-com1.fs
 and
 .Pa boot-com2.fs
+or
+.Pa boot-com.iso
 images for installation via serial console.
 .if \n[i386] \{\
 You may also possibly (but not necessarily) want to use
@@ -133,7 +139,21 @@
 and
 .Pa bootlap2.fs
 if installing on a laptop.
+The INSTALL_LAPTOP kernel can be loaded from one of the cdrom images via
+the bootloader:
+.Ic boot Ar nblaptop .
 .\}
+.Pp
+The default kernel on ISO images have ACPI enabled. This is known to cause
+issues on a few older machines which have buggy ACPI tables. To boot with
+ACPI disabled, interrupt the 
+.Nx
+boot loader, and enter:
+.Ic boot Fl c .
+At the userconf promt, enter:
+.Ic disable acpi
+followed by:
+.Ic quit .
 .\}
 .if \n[macppc] \{\
 files necessary to boot your system.
Index: i386/whatis
===================================================================
RCS file: /cvsroot/src/distrib/notes/i386/whatis,v
retrieving revision 1.20
diff -u -r1.20 whatis
--- i386/whatis	5 May 2007 23:07:12 -0000	1.20
+++ i386/whatis	16 May 2007 17:05:08 -0000
@@ -12,6 +12,11 @@
 .Pp
 Some (but not all!) notable \*M-specific improvements include:
 .(bullet
+Default kernels now have ACPI enabled by default. If this cause problems
+on your hardware, use userconf and
+.Ic disable acpi
+to boot without ACPI support.
+.It
 TBD
 .bullet)
 .Pp

--u3/rZRmxL6MmkK24--