Try to catch up with installer changes in the installation notes.

Also, the per-platform features are moved to a common place, which makes
the MD layout easier to work on. m4.common is still a tangled mess of subtly
placed dnl, though...

3 files changed, 54 insertions, 22 deletions

diff --git a/distrib/notes/zaurus/contents b/distrib/notes/zaurus/contents
index ee3eaef766e..61394eaf284 100644
--- a/distrib/notes/zaurus/contents
+++ b/distrib/notes/zaurus/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.8 2009/02/28 20:53:00 miod Exp $
+dnl	$OpenBSD: contents,v 1.9 2009/05/12 21:06:51 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -21,9 +21,9 @@ dnl OpenBSDcd
 
 DistributionDescription(eleven)
 
-OpenBSDbase(47742339,128402380,shared)
+OpenBSDbase(47742339,128402380)
 
-OpenBSDcomp(19899514,66786294,shared)
+OpenBSDcomp(19899514,66786294)
 
 OpenBSDetc(516201,1376199)
 
diff --git a/distrib/notes/zaurus/features b/distrib/notes/zaurus/features
new file mode 100644
index 00000000000..44d2193b6c7
--- /dev/null
+++ b/distrib/notes/zaurus/features
@@ -0,0 +1,40 @@
+dnl	$OpenBSD: features,v 1.1 2009/05/12 21:06:51 miod Exp $
+dnl
+dnl This file lists almost all the conditional features of this port,
+dnl which are used to provide accurate installation notes.
+dnl
+dnl Information about the installer script features should be in sync with
+dnl	src/distrib/zaurus/ramdisk/install.md
+dnl and the list files in
+dnl	src/distrib/zaurus/ramdisk/list
+dnl
+dnl ====
+dnl
+dnl architecture name (for the packages directory)
+define({:-MACHINE_ARCH-:},arm)dnl
+dnl
+dnl define if /sbin/kbd exists on the media
+define({:-MDKBD-:},)dnl
+dnl
+dnl define if serial consoles needs to be enabled in /etc/ttys
+dnl (i.e. md_consoleinfo is not empty)
+define({:-MDSERCONS-:},1)dnl
+dnl
+dnl define if SMP kernels are provided
+define({:-MDSMP-:},)dnl
+dnl
+dnl define if shared libraries are provided
+define({:-MDSO-:},1)dnl
+dnl
+dnl define if some media have timezone information (TZ in their list)
+define({:-MDTZ-:},)dnl
+dnl
+dnl define if glass console is possible
+dnl (XXX does not imply availablity of X servers though)
+define({:-MDX-:},1)dnl
+dnl
+dnl define if the X server can-:}t start until machdep.allow_aperture is set
+define({:-MDXAPERTURE-:},)dnl
+dnl
+dnl define if the X server can start without a configuration file
+define({:-MDXDM-:},1)dnl
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index cd91c0f8584..1ea04d272c0 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.23 2008/10/16 00:05:09 krw Exp $
+dnl	$OpenBSD: install,v 1.24 2009/05/12 21:06:51 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -80,15 +80,9 @@ partition on the C3x00 hard drive, you can instead use
 
 OpenBSDInstallPart2
 
-OpenBSDBootMsgs(,"wd0")
+OpenBSDInstallPart3(,"wd0")
 
-	You will next be asked for your terminal type.  If you are
-	installing from a non-serial console, the default of "vt220"
-	is correct.  If you are installing from a serial console
-	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt220.)
-
-OpenBSDInstallPart3
+OpenBSDInstallPart4
 
 	Next you will have to create an OpenBSD partition with fdisk,
 	and then create a disk label within it.
@@ -101,9 +95,9 @@ OpenBSDInstallPart3
 	correct this.  Note that you do not need to make OpenBSD be
 	the active partition.
 
-OpenBSDInstallPart4({:- If you have Linux partitions
-	defined on the disk, these will usually show up as partition
-	'i', 'j' and so on.-:})
+OpenBSDInstallPart5({:-
+	If you have Linux partitions defined on the disk, these will
+	usually show up as partition 'i', 'j' and so on.-:})
 
 	One of the three partitions on the Zaurus C3x00 hard drive is
 	a 3GB or 5GB MS-DOS filesystem.  This partition has application
@@ -120,23 +114,21 @@ OpenBSDInstallPart4({:- If you have Linux partitions
 	reformat it from Linux or OpenBSD once OpenBSD is installed.
 	(You will be reminded of this later in this document)
 
-OpenBSDInstallPart5(wd0)
-
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallPart6({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDCDROMInstall
 
 OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:})
 
-OpenBSDCommonFS
+OpenBSDCommonInstall
+
+OpenBSDTAPEInstall
 
-OpenBSDCommonURL
+OpenBSDWrapup
 
 OpenBSDCongratulations