summaryrefslogtreecommitdiff
path: root/distrib/notes/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/notes/amd64')
-rw-r--r--distrib/notes/amd64/contents6
-rw-r--r--distrib/notes/amd64/features40
-rw-r--r--distrib/notes/amd64/install34
3 files changed, 52 insertions, 28 deletions
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 8bd0bf2bd1b..66eef8ea172 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-dnl $OpenBSD: contents,v 1.24 2009/02/28 20:53:00 miod Exp $
+dnl $OpenBSD: contents,v 1.25 2009/05/12 21:06:50 miod Exp $
TopPart
OpenBSDfloppy
@@ -47,9 +47,9 @@ dnl useful for the installation.
DistributionDescription(eleven)
-OpenBSDbase(52573257,162742420,shared)
+OpenBSDbase(52573257,162742420)
-OpenBSDcomp(103205981,357455630,shared)
+OpenBSDcomp(103205981,357455630)
OpenBSDetc(511845,1524576)
diff --git a/distrib/notes/amd64/features b/distrib/notes/amd64/features
new file mode 100644
index 00000000000..6cf76385592
--- /dev/null
+++ b/distrib/notes/amd64/features
@@ -0,0 +1,40 @@
+dnl $OpenBSD: features,v 1.1 2009/05/12 21:06:50 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/amd64/common/install.md
+dnl and the list files in
+dnl src/distrib/amd64/{common/list,ramdisk_cd/list.local}
+dnl
+dnl ====
+dnl
+dnl architecture name (for the packages directory)
+define({:-MACHINE_ARCH-:},MACHINE)dnl
+dnl
+dnl define if /sbin/kbd exists on the media
+define({:-MDKBD-:},1)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-:},1)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-:},1)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-:},1)dnl
+dnl
+dnl define if the X server can start without a configuration file
+define({:-MDXDM-:},1)dnl
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 348e47297b7..25ed1c68513 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl $OpenBSD: install,v 1.11 2008/10/16 00:05:09 krw Exp $
+dnl $OpenBSD: install,v 1.12 2009/05/12 21:06:50 miod Exp $
OpenBSDInstallPrelude
If OpenBSD will be sharing the disk with another operating system,
@@ -42,16 +42,10 @@ OpenBSDInstallPart2
you do, please {:-include-:} as many details about your system
configuration as you can.
-OpenBSDBootMsgs
-
- 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 edit or create a disk label for the disk
OpenBSD is being installed on. If there are any existing
partitions defined (for any operating system), and a disk label
@@ -66,34 +60,24 @@ OpenBSDInstallPart3
correct this. Note that you should make OpenBSD be the active
partition at least until the install has been completed.
-OpenBSDInstallPart4({:- If you have DOS or Linux partitions
- defined on the disk, these will usually show up as partition
- 'i', 'j' and so on.-:})
+OpenBSDInstallPart5({:-
+ If you have DOS or Linux partitions defined on the disk, these
+ will usually show up as partition 'i', 'j' and so on.-:})
-OpenBSDInstallPart5(wd0)
-
-OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallPart6({:-CD-ROM, -:})
OpenBSDFTPInstall
OpenBSDHTTPInstall
-OpenBSDTAPEInstall
-
OpenBSDCDROMInstall
OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
-OpenBSDCommonFS
+OpenBSDCommonInstall
-OpenBSDCommonURL
+OpenBSDTAPEInstall
OpenBSDInstallWrapup
-OpenBSDInstallAperture
-
-OpenBSDInstallConsole
-
-OpenBSDInstallWrapupPart2
-
OpenBSDCongratulations