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

On Wed, May 16, 2007 at 07:07:56PM +0200, Manuel Bouyer wrote:
> 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 ?

Here is a second version. I did some typo fixes and gave some examples
of use for $MACHINE/installation/cdrom. I also added INSTALL_LARGE and
GENERIC.NOACPI to the kernel lists for i386.

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

--envbJBWh7q8WU6mo
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	22 May 2007 14:23:36 -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	22 May 2007 14:23:36 -0000
@@ -72,6 +72,13 @@
 kernel containing code for everything supported in this release.  This 
 kernel also supports SMP on systems with more than one CPU.
 .\}
+.if \n[i386] \{\
+.			It Pa netbsd-GENERIC.NOACPI.gz
+A gzipped
+.Nx
+kernel containing code for everything supported in this release but without
+ACPI support, for use on legacy hardware.
+.\}
 .
 .if \n[amd64] \{\
 .			It Pa netbsd-INSTALL.gz
@@ -139,6 +146,12 @@
 .Li INSTALL
 that has USB, PCMCIA and CardBus enabled to allow
 installing on laptop machines.
+.			It Pa netbsd-INSTALL_LARGE.gz
+A version of
+.Li INSTALL
+that has ACPI and some large disk and network driver, to allow installing
+on the newest machines.
+This is the default boot kernel from the ISO images.
 .			It Pa netbsd-INSTALL_PS2.gz
 A version of
 .Li INSTALL
@@ -277,11 +290,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 +342,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	22 May 2007 14:23:36 -0000
@@ -117,15 +117,22 @@
 .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 contain binary sets - these are intended for network
+installs, or when different bootblocks are needed).
 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,6 +140,25 @@
 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 prompt, enter:
+.Ic disable acpi
+followed by:
+.Ic quit .
+.if \n[i386] \{\
+The kernel from the two floppy set is also present on the ISO images and can be
+loaded using:
+.Ic boot Ar nbnoacpi .
 .\}
 .\}
 .if \n[macppc] \{\
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	22 May 2007 14:23:36 -0000
@@ -12,6 +12,14 @@
 .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.
+You can also boot a legacy kernel from cdrom using:
+.Ic boot Ar nbnoacpi ,
+and choose to install the GENERIC.NOACPI kernel set from sysinst.
+.It
 TBD
 .bullet)
 .Pp

--envbJBWh7q8WU6mo--