diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-12 21:06:52 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-05-12 21:06:52 +0000 |
| commit | 4bd4f59da1c92d5b558c52d635c025034fbda35e (patch) | |
| tree | 6df3c6c273de222204a033e9451eb25e770f7523 /distrib/notes | |
| parent | 8203708055a4de06b9a2f1753a6c2d2090d94394 (diff) | |
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...
Diffstat (limited to 'distrib/notes')
55 files changed, 1295 insertions, 697 deletions
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL index c8b0eb25c31..82c4c02a7f3 100644 --- a/distrib/notes/INSTALL +++ b/distrib/notes/INSTALL @@ -1,5 +1,6 @@ -dnl $OpenBSD: INSTALL,v 1.42 2008/08/05 22:53:51 miod Exp $ +dnl $OpenBSD: INSTALL,v 1.43 2009/05/12 21:06:48 miod Exp $ include(INCLUDE/../m4.common)dnl +includeit(features)dnl INSTALLATION NOTES for OpenBSD/MACHINE OSREV diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile index 700e2ac226a..ff51e548243 100644 --- a/distrib/notes/Makefile +++ b/distrib/notes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.33 2009/05/12 21:06:48 miod Exp $ NOPROG= NOMAN= @@ -11,7 +11,7 @@ TARG= INSTALL.$M SRC= $(.CURDIR)/INSTALL DEP= $(SRC) $(.CURDIR)/mirrors $(.CURDIR)/$M/whatis $(.CURDIR)/$M/contents \ $(.CURDIR)/$M/hardware $(.CURDIR)/$M/xfer $(.CURDIR)/$M/prep \ - $(.CURDIR)/$M/install $(.CURDIR)/$M/upgrade \ + $(.CURDIR)/$M/install $(.CURDIR)/$M/upgrade ${.CURDIR}/$M/features \ $(.CURDIR)/packages $(.CURDIR)/m4.common all: $(TARG) diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents index a5537afe838..17f44bef7ad 100644 --- a/distrib/notes/alpha/contents +++ b/distrib/notes/alpha/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.47 2009/02/28 20:52:58 miod Exp $ +dnl $OpenBSD: contents,v 1.48 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDfloppy @@ -40,9 +40,9 @@ dnl boot, bootxx, netboot dnl DistributionDescription(eleven) -OpenBSDbase(58301621,180831693,shared) +OpenBSDbase(58301621,180831693) -OpenBSDcomp(106753958,373031727,shared) +OpenBSDcomp(106753958,373031727) OpenBSDetc(511812,1523950) diff --git a/distrib/notes/alpha/features b/distrib/notes/alpha/features new file mode 100644 index 00000000000..029ead7e348 --- /dev/null +++ b/distrib/notes/alpha/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/alpha/common/install.md +dnl and the list files in +dnl src/distrib/alpha/{bsd.rd,common}/list +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-:},)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-:},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-:},)dnl diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install index d0b41a2b1ff..3f40f86a40c 100644 --- a/distrib/notes/alpha/install +++ b/distrib/notes/alpha/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.32 2008/08/06 17:22:14 miod Exp $ +dnl $OpenBSD: install,v 1.33 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way is @@ -105,42 +105,26 @@ OpenBSDInstallPart2 media is bad, your diskless setup is incorrect, or you may have a hardware or configuration problem. -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 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:}) -OpenBSDCommonFS +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallAperture - -OpenBSDInstallConsole - -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations 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 diff --git a/distrib/notes/armish/contents b/distrib/notes/armish/contents index 7ae3e122f68..3985b0b32a3 100644 --- a/distrib/notes/armish/contents +++ b/distrib/notes/armish/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.5 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.6 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -11,9 +11,9 @@ dnl OpenBSDcd DistributionDescription(eleven) -OpenBSDbase(53942620,156076367,shared) +OpenBSDbase(53942620,156076367) -OpenBSDcomp(86092044,241839883,shared) +OpenBSDcomp(86092044,241839883) OpenBSDetc(516616,1539462) diff --git a/distrib/notes/armish/features b/distrib/notes/armish/features new file mode 100644 index 00000000000..44607b09703 --- /dev/null +++ b/distrib/notes/armish/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/armish/ramdisk/install.md +dnl and the list files in +dnl src/distrib/armish/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-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/armish/install b/distrib/notes/armish/install index 33aff7a653d..828985216de 100644 --- a/distrib/notes/armish/install +++ b/distrib/notes/armish/install @@ -1,17 +1,11 @@ -dnl $OpenBSD: install,v 1.7 2008/10/16 00:05:09 krw Exp $ +dnl $OpenBSD: install,v 1.8 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude 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 edit or create a disk label for the disk OpenBSD is being installed on. If there are any existing @@ -27,13 +21,11 @@ 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 Linux partitions - defined on the disk, these will usually show up as partition - 'i', 'j' and so on.-:}) - -OpenBSDInstallPart5(wd0) +OpenBSDInstallPart5({:- + If you have Linux partitions defined on the disk, these will + usually show up as partition 'i', 'j' and so on.-:}) -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall @@ -43,12 +35,8 @@ OpenBSDCDROMInstall OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:}) -OpenBSDCommonFS - -OpenBSDCommonURL +OpenBSDCommonInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/aviion/features b/distrib/notes/aviion/features new file mode 100644 index 00000000000..45139d75644 --- /dev/null +++ b/distrib/notes/aviion/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/aviion/install.md +dnl and the list files in +dnl src/distrib/aviion/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m88k)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-:},)dnl +dnl +dnl define if SMP kernels are provided +define({:-MDSMP-:},)dnl +dnl +dnl define if shared libraries are provided +define({:-MDSO-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents index b718e429810..ed9dcc4bb56 100644 --- a/distrib/notes/hp300/contents +++ b/distrib/notes/hp300/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.42 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.43 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -14,9 +14,9 @@ OpenBSDrd DistributionDescription(eleven) -OpenBSDbase(49864698,160453569,shared) +OpenBSDbase(49864698,160453569) -OpenBSDcomp(59112072,199026782,shared) +OpenBSDcomp(59112072,199026782) OpenBSDetc(513941,1531164) diff --git a/distrib/notes/hp300/features b/distrib/notes/hp300/features new file mode 100644 index 00000000000..b8645695e3f --- /dev/null +++ b/distrib/notes/hp300/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/hp300/ramdisk/install.md +dnl and the list files in +dnl src/distrib/hp300/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m68k)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-:},)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-:},)dnl diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install index a7b36fddf2e..edd23c8ecab 100644 --- a/distrib/notes/hp300/install +++ b/distrib/notes/hp300/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.34 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.35 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude({:-HP-IB disks-:}) The ramdisk kernel may be loaded from the network, from CD-ROM, or other @@ -89,19 +89,13 @@ OpenBSDInstallPart2 either your boot media is bad, your diskless setup is incorrect, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(warn,{:-"sd0" for SCSI drives-:},{:-or "hd0" for HP-IB +OpenBSDInstallPart3(warn,{:-"sd0" for SCSI drives-:},{:-or "hd0" for HP-IB drives-:}) - 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 +OpenBSDInstallPart5 + Since the target disk will become the boot disk for your new OpenBSD/MACHINE installation, the disklabel program will restrict the available disk area to keep the first cylinder, which will @@ -109,28 +103,22 @@ OpenBSDInstallPart4 plan to install a bootblock on this disk, you can reclaim this space with the 'b' command. -OpenBSDInstallPart5(sd0) - -OpenBSDInstallNet({:-CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall({:-"hdN" or -:},{:-only -:}) -OpenBSDCommonFS(NFS) +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents index 038a9ba460e..93d3ce59c42 100644 --- a/distrib/notes/hppa/contents +++ b/distrib/notes/hppa/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.20 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.21 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -18,9 +18,9 @@ OpenBSDcd DistributionDescription(eleven) -OpenBSDbase(49379319,134401253,shared) +OpenBSDbase(49379319,134401253) -OpenBSDcomp(75933635,267477556,shared) +OpenBSDcomp(75933635,267477556) OpenBSDetc(511529,1523414) diff --git a/distrib/notes/hppa/features b/distrib/notes/hppa/features new file mode 100644 index 00000000000..9e1ba4df590 --- /dev/null +++ b/distrib/notes/hppa/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/hppa/install.md +dnl and the list files in +dnl src/distrib/hppa/{,ramdisk/}list +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-:},)dnl +dnl +dnl define if serial consoles needs to be enabled in /etc/ttys +dnl (i.e. md_consoleinfo is not empty) +define({:-MDSERCONS-:},)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-:},)dnl diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install index 3cf0a220f4d..acfa40548a2 100644 --- a/distrib/notes/hppa/install +++ b/distrib/notes/hppa/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.16 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.17 2009/05/12 21:06:50 miod Exp $ dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially OpenBSDInstallPrelude @@ -118,18 +118,12 @@ OpenBSDInstallPart2 media is bad, your diskless setup is incorrect, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(,"sd0") - - 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 +OpenBSDInstallPart3(,"sd0") OpenBSDInstallPart4 +OpenBSDInstallPart5 + Since the target disk will become the boot disk for your new OpenBSD/MACHINE installation, the disklabel program will restrict the available disk area to keep the first cylinder, which will @@ -137,28 +131,22 @@ OpenBSDInstallPart4 plan to install a bootblock on this disk, you can reclaim this space with the 'b' command. -OpenBSDInstallPart5(sd0) - -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents index 5915fbe6155..34c4017d763 100644 --- a/distrib/notes/i386/contents +++ b/distrib/notes/i386/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.63 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.64 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDfloppy @@ -60,9 +60,9 @@ useful for the installation. DistributionDescription(eleven) -OpenBSDbase(48068630,144643358,shared) +OpenBSDbase(48068630,144643358) -OpenBSDcomp(89983487,249227039,shared) +OpenBSDcomp(89983487,249227039) OpenBSDetc(512993,1527714) diff --git a/distrib/notes/i386/features b/distrib/notes/i386/features new file mode 100644 index 00000000000..e5031867c55 --- /dev/null +++ b/distrib/notes/i386/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/i386/common/install.md +dnl and the list files in +dnl src/distrib/i386/{common/list,ramdiskC/list.local,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/i386/install b/distrib/notes/i386/install index 76a4783d863..5ef83ea31c9 100644 --- a/distrib/notes/i386/install +++ b/distrib/notes/i386/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.43 2008/10/16 00:05:09 krw Exp $ +dnl $OpenBSD: install,v 1.44 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude If OpenBSD will be sharing the disk with DOS or another operating @@ -45,16 +45,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 @@ -69,34 +63,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 diff --git a/distrib/notes/landisk/contents b/distrib/notes/landisk/contents index 3753ee704c6..23a6ab520d9 100644 --- a/distrib/notes/landisk/contents +++ b/distrib/notes/landisk/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.5 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.6 2009/05/12 21:06:50 miod Exp $ TopPart dnl can't use OpenBSDminiroot here - comment is inappropriate @@ -17,9 +17,9 @@ dnl XXX describe boot, mbr, and xxboot. Or stop providing them? DistributionDescription(eleven) -OpenBSDbase(48115471,135816312,shared) +OpenBSDbase(48115471,135816312) -OpenBSDcomp(95261055,271776244,shared) +OpenBSDcomp(95261055,271776244) OpenBSDetc(511220,1522236) diff --git a/distrib/notes/landisk/features b/distrib/notes/landisk/features new file mode 100644 index 00000000000..d222d0dac41 --- /dev/null +++ b/distrib/notes/landisk/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/landisk/ramdisk/install.md +dnl and the list files in +dnl src/distrib/landisk/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},sh)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-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install index 4584d3730e9..30c082bcbef 100644 --- a/distrib/notes/landisk/install +++ b/distrib/notes/landisk/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.5 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.6 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude OpenBSDInstallPart2 @@ -6,15 +6,9 @@ OpenBSDInstallPart2 If you have copied the miniroot image to the disk, it will boot automatically upon power-up. -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({:-"wd0" for IDE drives-:}) +OpenBSDInstallPart4({:-"wd0" for IDE drives-:}) Next you will have to edit or create a disk label for the disk OpenBSD is being installed on. You will first be given an @@ -27,11 +21,9 @@ OpenBSDInstallPart3({:-"wd0" for IDE drives-:}) necessary to correct this. Note that you should make OpenBSD be the active partition at least until the install has been completed. -OpenBSDInstallPart4 - -OpenBSDInstallPart5(wd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall @@ -41,12 +33,8 @@ OpenBSDCDROMInstall OpenBSDDISKInstall({:-"wdN" or -:},{:-only-:}) -OpenBSDCommonFS - -OpenBSDCommonURL +OpenBSDCommonInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/luna88k/features b/distrib/notes/luna88k/features new file mode 100644 index 00000000000..3e6ec811d02 --- /dev/null +++ b/distrib/notes/luna88k/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/luna88k/ramdisk/install.md +dnl and the list files in +dnl src/distrib/luna88k/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m88k)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-:},)dnl +dnl +dnl define if SMP kernels are provided +define({:-MDSMP-:},)dnl +dnl +dnl define if shared libraries are provided +define({:-MDSO-:},)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-:},)dnl diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install index a943ef426e9..60b5e3175e9 100644 --- a/distrib/notes/luna88k/install +++ b/distrib/notes/luna88k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.6 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.7 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -75,40 +75,28 @@ OpenBSDInstallPart2 diskless setup isn't correct, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(,"sd0") - - 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 +OpenBSDInstallPart3(,"sd0") OpenBSDInstallPart4 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall(1) - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS(NFS) - -OpenBSDCommonURL +OpenBSDCommonInstall -OpenBSDInstallWrapup +OpenBSDTAPEInstall(1) -OpenBSDInstallWrapupPart2 +OpenBSDInstallWrapup OpenBSDCongratulations diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index f5d759bf05d..4b132630366 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.83 2009/04/17 04:03:33 deraadt Exp $ +dnl $OpenBSD: m4.common,v 1.84 2009/05/12 21:06:48 miod Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org> dnl @@ -15,26 +15,6 @@ dnl WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. dnl -dnl -dnl a simple MACHINE->MACHINE_ARCH converter. -define(`MACHINE_ARCH', -`ifelse( -MACHINE,amiga,m68k, -MACHINE,armish,arm, -MACHINE,aviion,m88k, -MACHINE,hp300,m68k, -MACHINE,landisk,sh, -MACHINE,luna88k,m88k, -MACHINE,mac68k,m68k, -MACHINE,macppc,powerpc, -MACHINE,mvme68k,m68k, -MACHINE,mvme88k,m88k, -MACHINE,mvmeppc,powerpc, -MACHINE,sgi,mips64, -MACHINE,socppc,powerpc, -MACHINE,sun3,m68k, -MACHINE,zaurus,arm, -MACHINE)')dnl dnl simulate an include path with a macro 'includeit'. define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl dnl @@ -66,8 +46,8 @@ dnl o base`'OSrev is required because if it appears as baseOSrev the dnl defined value OSrev does not get substituted. Same goes for MACHINE, dnl MACHINE_ARCH and OSREV, assigned as cmd line parameters to m4 in the dnl Makefile. -dnl o `include' and `define' is required as include and define are both m4 -dnl reserved words that evaluate to NULL if not quoted. +dnl o `include', `define' and `shift' is required as these three words +dnl are m4 reserved words that evaluate to an empty string if not quoted. dnl dnl dnl ========== Distribution files description @@ -111,30 +91,28 @@ the "MACHINE" subdirectory of the OpenBSD OSREV distribution tree, and are as follows:-:})dnl dnl dnl -dnl OpenBSDbase( compressed size, uncompressed size [, shared]) -dnl Describes baseXX.tgz. Put ``shared'' as third argument if shared libraries -dnl are available. +dnl OpenBSDbase( compressed size, uncompressed size ) +dnl Describes baseXX.tgz. dnl define({:-OpenBSDbase-:}, {:- base{:--:}OSrev The OpenBSD/MACHINE OSREV base binary distribution. You MUST install this distribution set. It contains the base OpenBSD utilities that are necessary for the system to run and be minimally functional. - ifelse(X$3,Xshared,{:-It includes shared library support, and excludes - everything described below.-:},{:-It excludes everything described below.-:})showsize($1,$2)-:})dnl + ifelse(MDSO,,{:-It excludes everything described below.-:},{:-It includes shared library support, and excludes everything + described below.-:})showsize($1,$2)-:})dnl dnl dnl -dnl OpenBSDcomp( compressed size, uncompressed size [, shared]) -dnl Describes compXX.tgz. Put ``shared'' as third argument if shared libraries -dnl are available. +dnl OpenBSDcomp( compressed size, uncompressed size ) +dnl Describes compXX.tgz. dnl define({:-OpenBSDcomp-:}, {:- comp{:--:}OSrev The OpenBSD/MACHINE Compiler tools. All of the tools relating to C, C++, Objective-C and Fortran are supported. This set includes the system {:-include-:} files (/usr/{:-include-:}), the linker, - the compiler tool chain, and the various system libraries{:--:}ifelse(X$3,Xshared,{:- + the compiler tool chain, and the various system libraries{:--:}ifelse(MDSO,,.,{:- (except the shared libraries, which are included as part of - the base set).-:},.) + the base set).-:}) This set also includes the manual pages for all of the utilities it contains, as well as the system call and library manual pages.showsize($1,$2)-:})dnl @@ -278,7 +256,7 @@ dnl (usually used by arch/install) dnl dnl OpenBSDInstallPrelude(troublesome disk types) dnl -dnl Installation introduction. Warns about disk geometry hell if argument +dnl Installation introduction. Warns about disk geometry hell if argument dnl is not empty. define({:-OpenBSDInstallPrelude-:}, {:-Installing OpenBSD is a relatively complex process, but if you have @@ -303,22 +281,31 @@ dnl installation media is ready. define({:-OpenBSDInstallPart2-:}, {:-You should now be ready to install OpenBSD. -The following is a walk-through of the steps you will take while -getting OpenBSD installed on your hard disk. If any question has a -default answer, it will be displayed in brackets ("[]") after the -question. If you wish to stop the installation, you may hit Control-C -at any time, but if you do, you'll have to begin the installation -process again from scratch. Using Control-Z to suspend the process -may be a better option, or at any prompt enter '!' to get a shell, -from which 'exit' will return you back to that prompt (no refresh -of the prompt though).-:})dnl +The following is a walk-through of the steps you will take while getting +OpenBSD installed on your hard disk. + +The installation procedure is designed to gather as many information about +your system setup as possible at the beginning, so that no human interaction +is required as soon as the questions are over. + +The order of these questions might be quite deconcerting if you are used to +other installation procedures, including older OpenBSD versions. + +If any question has a default answer, it will be displayed in brackets ("[]") +after the question. If you wish to stop the installation, you may hit +Control-C at any time, but if you do, you'll have to begin the installation +process again from scratch. Using Control-Z to suspend the process may be a +better option, or at any prompt enter `!' to get a shell, from which 'exit' +will return you back to that prompt (no refresh of the prompt will occur, +though).-:})dnl dnl -dnl OpenBSDBootMsgs(warn geometry, disk type, disk type, disk type) +dnl OpenBSDInstallPart3(warn geometry, disk type, disk type, disk type) dnl dnl Describes the boot of the ramdisk, the expected disk devices dnl names, and warns bore the reader with geometry concerns if the dnl first argument is not empty. -define({:-OpenBSDBootMsgs-:}, +dnl Describes the serial terminal setup. +define({:-OpenBSDInstallPart3-:}, {:- Once the kernel has loaded, you will be presented with the OpenBSD kernel boot messages. You will want to read them to determine your disks name and geometry. Its name will @@ -330,176 +317,292 @@ define({:-OpenBSDBootMsgs-:}, You will also need to know the device name to tell the install tools what disk to install on. If you cannot read the messages as they scroll by, do not worry -- you can get - at this information later inside the install program.-:})dnl + at this information later inside the install program. + +dnl dot.profile + After the kernel is done initialization, you will be asked whether + you wish to do an "(I)nstall" or an "(U)pgrade". Enter 'I' for a + fresh install or 'U' to upgrade an existing installation. + +dnl install.sub set_term +ifelse(MDX,, +{:- You will next be asked for your terminal type.-:}, +{:- If you are connected with a serial console, you will next be + asked for your terminal type.-:})dnl + + You should choose the terminal type from amongst those listed. + (If your terminal type is xterm, just use vt220).dnl +ifelse(MDKBD,,,{:- + + If you are connected using a glass console, you will next be + asked for your keyboard layout (the default being the US QWERTY + layout). Depending on your keyboard type, not all international + layouts may be supported; answering `?' (which, on QWERTY layouts, + is the key to the left of the right `sh{:--:}ift' key, shifted) will + display a list of supported layouts. + (If you do not need to change the keyboard layout, just press + enter.)-:})dnl +-:})dnl dnl -dnl OpenBSDInstallPart3 +dnl OpenBSDInstallPart4 dnl dnl Describes the beginning of the bsd.rd operation. dnl -define({:-OpenBSDInstallPart3-:}, -{:- After entering the terminal type you will be asked whether you - wish to do an "(I)nstall" or an "(U)pgrade". Enter 'I' for a - fresh install or 'U' to upgrade an existing installation. +define({:-OpenBSDInstallPart4-:},dnl +dnl install.sub (install) hostname/rootpwd +{:- The first question you will be asked is the system hostname + (without any domain part), followed by the initial root password + of the system, twice. + Although the install program will only check that the two + passwords match, you should make sure to use a strong password. + As a minimum, the password should be at least eight characters + long and a mixture of both lower and uppercase letters, numbers + and punctuation characters. + +dnl install.sub (install) questions(): sshd/ntpd + You will then be asked whether you want to start sshd(8) by + default, as well as ntpd(8). If you choose to start ntpd(8), + you will be asked for your ntp server; if you don't have any + preferred ntp server, press enter to confirm the default + setting of picking one of the pool.ntp.org servers. +dnl +dnl install.sub (install) questions(): MDXAPERTURE +ifelse(MDXAPERTURE,,,{:- + You will next be asked whether you intend to run the X Window + System on your machine. The install program needs to know + this, to change a configuration setting controlling whether + the X server will be able to access the xf86(4) driver; it + is not necessary to answer `y' to this question if you only + intend to run X client programs on a remote display. +-:})dnl +dnl install.sub (install) questions(): MDXDM +ifelse(MDXDM,,, +{:-ifelse(MDXAPERTURE,,{:- + Since the X Window System can run on OpenBSD/MACHINE + without the need for a configuration file, you will get asked-:}, +{:- If you answered `y' to this question, you will get asked-:}) + whether you want to start xdm on boot. +-:})dnl +dnl install.sub (install) questions(): serial console setup +ifelse(MDSERCONS,,,{:- + If you are installing using a serial console, and since by default, + the OpenBSD/MACHINE installation will only start terminals on + the primary display device, the installation program will ask you + whether you want to also enable an additional terminal on that + line, and will allow you to select the line speed. +-:})dnl - You will be presented with a welcome message and asked if - you really wish to install (or upgrade). Assuming you - answered yes, the install program will then tell you which - disks it can install on, and ask you which it should use. - Reply with the name of your disk.-:})dnl +dnl install.sub (install) user_setup() + You will now be given the possibility to setup a user account + on the forthcoming system. This user will be added to the + `wheel' group. + + Enter the desired login name, or `n' if you do not want to + add a user account at this point. Valid login names are + sequences of digits and lowercase letters, and must start + with a lowercase letter. If the login name matches this + criteria, and doesn't conflict with one of the administrative + user accounts (such as `root', `daemon' or `ftp'), you + will be prompted with the users descriptive name, as well + as its password, twice. + As for the root password earlier, the install program will only + check that the two passwords match, but you should make sure to + use a strong password here as well, different from the root + password. + + If you have choosen to setup a user account, and you had choosen + to start sshd(8) on boot, you will be given the possibility to + disable sshd(8) logins as root. + +dnl install.sub (install) donetconfig + You will now be given an opportunity to configure the network. + The network configuration you enter (if any) can then be used to + do the install from another system using HTTP or FTP, and will + also be the configuration used by the system after the installation + is complete. + +dnl XXX add a MDVLAN feature and document vlan setup + The install program will give you a list of network interfaces you + can configure. For each network interface you select to configure, + you will be asked for: + + - the symbolic host name to use (except for the first + interface setup, which will reuse the host name entered at the + beginning of the installation). + + - the IPv4 settings: address and netmask. If the IP address + should be obtained from a DHCP server, simply enter ``dhcp'' + when asked for the address. + + - the IPv6 settings (address, prefix length, and default router). + You may enter ``rtsol'' when asked for the address for the + interface to configure automatically via router sollicitation + messages. + + After all interfaces have been configured, if there have been + any IPv4 interfaces setup, you will be asked for the IPv4 default + route. This step is skipped if you only have one IPv4 interface + setup, and it is configured with DHCP. + + The install program will also ask you for your DNS domain name, + and the domain name servers, unless these informations have + been obtained from a DHCP server during interface setup. + + You will also be presented with an opportunity to do more + manual configuration. If you accept, you will be dropped + to a shell; when you are done, enter `exit' to return to + the installation program. +dnl install.sub (install nifs == 0) set_timezone +ifelse(MDTZ,,, +{:- + If no network interfaces have been configured, you may + now be given the opportunity to configure the time zone + your system will be using (this depends on the installation + media you are using). + If the installation program skips this test, do not be + alarmed, the time zone will be configured at the end + of the installation. +-:})dnl + + The installation program will now tell you which disks + it can install on, and ask you which it should use. + Reply with the name of your root disk.-:})dnl dnl -dnl OpenBSDInstallPart4(mention about other OS partitions) +dnl OpenBSDInstallPart5(mention about other OS partitions) dnl Describes the disklabel operation dnl -define({:-OpenBSDInstallPart4-:}, +define({:-OpenBSDInstallPart5-:}, {:- Next the disk label which defines the layout of the OpenBSD - partitions must be set up. Each file system you want will + partitions must be set up. Each file system you want will require a separate partition. - The installation script will invoke an interactive editor allowing - you to create your desired layout. If you are labeling a new disk, - you will probably start out with only the 'c' partition of fstype - 'unused' that represents the whole disk. You cannot modify the 'c' - partition! You must create partition 'a' as a native OpenBSD - partition, i.e. one with "4.2BSD" as the fstype, to hold the root - file system. +dnl install.sh md_prep_disklabel loop + For the first disk (which will be the boot disk, hosting the + root partition), you will be proposed a default layout, trying + to set up separate partitions, disk size permitting. + + You will be given the possibility to either accept the proposed + layout, or edit it, or do your own custom layout. These last + two choices will invoke an interactive editor allowing you to + create your desired layout. + + Within the editor, you will probably start out with only the + 'c' partition of fstype 'unused' that represents the whole disk. + This partition can not be modified. You must create partition 'a' + as a native OpenBSD partition, i.e. one with "4.2BSD" as the + fstype, to hold the root file system. In addition to partition 'a' you should create partition 'b' with fstype "swap", and native OpenBSD partitions to hold separate file - systems for /usr, /tmp, /var, and /home. + systems such as /usr, /tmp, /var, and /home.$1 + + You will need to provide a mount point for all partitions you + {:-define-:}. Partitions without mount points, or not of 4.2BSD fstype, + will not be formatted during the installation. + +dnl XXX Write a real disklabel-in-a-nutshell introduction here. +dnl XXX If only to mention disk sizes can be specified with suffixes, +dnl XXX not enough people know this! + For quick help while in the interactive editor, enter '?'. The + `z' command (which deletes all partitions and starts with a + clean label), the `A' command (which performs the automatic + partition layout) and the `n' command (to change mount points) + are of particular interest. - For quick help while in the interactive editor, enter '?'. Enter 'M' - to view the entire manual page (see the info on the ``-E'' flag). To - exit the editor enter 'q'.-:})dnl + Enter 'M' to view the entire manual page (see the info on the + ``-E'' flag). To exit the editor enter 'q'.-:})dnl dnl -dnl OpenBSDInstallPart5 -dnl More disklabel notes(disk) -define({:-OpenBSDInstallPart5-:}, -{:- After you exit the interactive editor the install program will - ask you to confirm or specify where each "4.2BSD" partition in - the disklabel is to be mounted. The 'a' partition is always the - root file system. The install program will cycle over the - other "4.2BSD" partitions until you enter "done". - - When you enter "done" you will be asked to confirm that the - partition and mount point information is correct. This is the - point of no return! If you accept the displayed information - new file systems are created on all partitions to be mounted. - This will DESTROY ALL EXISTING DATA on those partitions.-:})dnl -dnl -dnl OpenBSDInstallNet(other installation sources,hasfloppy) +dnl OpenBSDInstallPart6(other installation sources) dnl Setting up the network -define({:-OpenBSDInstallNet-:}, -{:- After all your file systems have been created, the install program - will prompt you for the system hostname, and will give you an - opportunity to configure the network. The network configuration - you enter (if any) can then be used to do the install from another - system using HTTP or FTP, and will also be the configuration used - by the system after the installation is complete. - - Note that the system hostname should be without the domain part. - -If you select to configure the network, the install program will -ask you for the name of your system and the DNS domain name to use. -Note that the host name should be without the domain part, and that -the domain name should NOT {:-include-:} the host name part. - - If you select to configure the network, the install program will - give you a list of network interfaces you can configure. For each - network interface you select to configure, it will ask for the IP - address to use, the symbolic host name to use, the netmask to use, - and any interface-specific flags to set. If the IP address should - be obtained from a DHCP server, simply enter ``dhcp'' when asked - for the IP address. The interface-specific flags are usually used - to determine which media the network card is to use. Typically no - media flags are required as autodetection normally works, but you - will be prompted with a list of the acceptable media flags, and - asked if you want to provide any. In doubt, do not enter any media - flags; or you can refer to the manual page for your interface for - the appropriate flags. - - After all network interfaces have been configured, the install pro- - gram will ask for the DNS domain name to use, as well as the IP - address of the primary name server to use. Finally, you will be - asked for the IP address of the default route. - - You will also be presented with an opportunity to edit the host - table. - - At this point you will be asked for the initial root password of - the system, twice. Although the install program will only check - that the two passwords match, you should make sure to use a - strong password. As a minimum, the password should be at least - six characters long and a mixture of both lower and uppercase - letters, numbers and punctuation characters. - - After these preparatory steps have been completed, you will be +define({:-OpenBSDInstallPart6-:}, +{:- After the layout has been saved, new filesystems will be + created on all partitions with mount points. + This will DESTROY ALL EXISTING DATA on those partitions. +ifelse(MDTZ,,, +{:- + You may now be given the opportunity to configure the time zone + if it hasn't been configured yet (this depends on the installation + media you are using). + If the installation program skips this test, do not be + alarmed, the time zone will be configured at the end + of the installation. +-:})dnl + + After these preparatory steps have been completed, you will be able to extract the distribution sets onto your system. There are several install methods supported; FTP, HTTP, tape, - $1or a local disk partition. - ifelse(X$2,X,,{:-Note that installation from floppies is not currently supported.-:})-:})dnl + $1or a local disk partition.-:})dnl dnl dnl Notes for various installation methods. dnl define({:-OpenBSDFTPInstall-:}, {:- To install via FTP: To begin an FTP install you will need the following - pieces of information. Don't be daunted by this list; - the defaults are sufficient for most people. - 1) Proxy server URL if you are using a URL-based - FTP proxy (squid, CERN FTP, Apache 1.2 or higher). - You need to {:-define-:} a proxy if you are behind a - firewall that blocks outgoing FTP (assuming you - have a proxy available to use). - 2) Do you need to use active mode FTP? By default, - ftp will attempt to use passive mode and fall - back to an active connection if the server does - not support passive mode. You only need to enable - this option if you are connecting to a buggy FTP - daemon that implements passive FTP incorrectly. - Note that you will not be asked about active - FTP if you are using a proxy. - 3) The IP address (or hostname if you enabled - DNS earlier in the install) of an FTP server - carrying the OpenBSD OSREV distribution. - If you don't know, answer ``y'' when asked if - you want to see a list of such hosts. - 4) The FTP directory holding the distribution sets. - The default value of pub/OpenBSD/OSREV/MACHINE - is almost always correct. - 5) The login and password for the FTP account. - You will only be asked for a password for - non-anonymous FTP. - - For instructions on how to complete the installation via - FTP, see the section named "Common URL installations" below.-:})dnl + pieces of information: + 1) Proxy server URL if you are using a URL-based + FTP proxy (squid, CERN FTP, Apache 1.2 or higher). + You need to {:-define-:} a proxy if you are behind a + firewall that blocks outgoing FTP (assuming you + have a proxy available to use). + 2) The IP address (or hostname if you configured + DNS servers earlier in the install) of an FTP server + carrying the OpenBSD OSREV distribution. + The installation program will try to fetch a list + of FTP servers; depending on your network settings, + this might fail. If the list could be fetched, it + will be displayed, and you can choose an entry from + the list (the first entries are expected to be the + closest mirrors to your location). + 3) The FTP directory holding the distribution sets. + The default value of pub/OpenBSD/OSREV/MACHINE + is almost always correct. + 4) The login and password for the FTP account. + You will only be asked for a password for + non-anonymous FTP. + + Then refer to the section named "installation set selection" + below.-:})dnl dnl define({:-OpenBSDHTTPInstall-:}, {:- To install via HTTP: To begin an HTTP install you will need the following pieces of information: - 1) Proxy server URL if you are using a URL-based - HTTP proxy (squid, CERN FTP, Apache 1.2 or higher). - You need to {:-define-:} a proxy if you are behind a - firewall that blocks outgoing HTTP connections - (assuming you have a proxy available to use). - 2) The IP address (or hostname if you enabled - DNS earlier in the install) of an HTTP server - carrying the OpenBSD OSREV distribution. - If you don't know, answer ``y'' when asked if - you want to see a list of such hosts. - 3) The directory holding the distribution sets. - There is no standard location for this; - You should use the directory specified - along with the server in the list of official - HTTP mirror sites that you received in step 3. - - For instructions on how to complete the installation via - HTTP, see the section named "Common URL installations" below.-:})dnl + 1) Proxy server URL if you are using a URL-based + HTTP proxy (squid, CERN FTP, Apache 1.2 or higher). + You need to {:-define-:} a proxy if you are behind a + firewall that blocks outgoing HTTP connections + (assuming you have a proxy available to use). + 2) The IP address (or hostname if you configured + DNS servers earlier in the install) of an FTP server + carrying the OpenBSD OSREV distribution. + The installation program will try to fetch a list + of HTTP servers; depending on your network settings, + this might fail. If the list could be fetched, it + will be displayed, and you can choose an entry from + the list (the first entries are expected to be the + closest mirrors to your location). + 3) The directory holding the distribution sets. + There is no standard location for this; + You should use the directory specified + along with the server in the list of official + HTTP mirror sites that you received in step 2. + + Then refer to the section named "installation set selection" + below.-:})dnl dnl dnl For arches where you can create a boot tape, $1 can be set as the dnl file index of the first set, after the boot files. define({:-OpenBSDTAPEInstall-:}, {:- To install from tape: + Unlike all other installation methods, there is no way + to know the names of the files on tape. Because of this, + it is impossible to check that the files on tape match + the machine architecture and release of OpenBSD/MACHINE. + + Moreover, since tape filenames are not known, the file + checksums can not be verified. Use this installation + method only if there is no better option. + In order to install from tape, the distribution sets to be installed must have been written to tape previously, either in tar format or gzip-compressed tar format. @@ -515,28 +618,22 @@ define({:-OpenBSDTAPEInstall-:}, The install program will not automatically detect whether an image has been compressed, so it will ask for that - information before starting the extraction.-:})dnl + information before starting the extraction of each file.-:})dnl dnl define({:-OpenBSDCDROMInstall-:}, {:- To install from CD-ROM: When installing from a CD-ROM, you will be asked which device holds the distribution sets. This will typically - be "cd0". Next you will be asked which partition on the - CD-ROM the distribution is to be loaded from. This is - normally partition "a". - - Next you will have to identify the file system type that - has been used to create the distribution on the CD-ROM, - this can be either FFS or ISO CD9660. The OpenBSD CD-ROM - distribution uses the CD9660 format. + be "cd0". If there is more than one partition on the + CD-ROM, you will be asked which partition the distribution + is to be loaded from. This is normally partition "a". You will also have to provide the relative path to the directory on the CD-ROM which holds the distribution, for the MACHINE this is "OSREV/MACHINE". - For instructions on how to complete the installation from - the CD-ROM distribution, see the section named "Common - file system installations" below.-:})dnl + Then refer to the section named "installation set selection" + below.-:})dnl dnl define({:-OpenBSDNFSInstall-:}, {:- To install from an NFS mounted directory: @@ -558,9 +655,8 @@ define({:-OpenBSDNFSInstall-:}, are located. Note that this path should not be prefixed with a '/'. - For instructions on how to complete the installation from - the CD-ROM distribution, see the section named "Common - file system installations" below.-:})dnl + Then refer to the section named "installation set selection" + below.-:})dnl dnl dnl OpenBSDDISKInstall({:-<additional disk> or-:}, <-- $1 dnl {:-only -:}, <-- $2 @@ -597,101 +693,69 @@ define({:-OpenBSDDISKInstall-:}, are located. Note that this path should not be prefixed with a '/'. - For instructions on how to complete the installation from - a local disk partition, see the next section.-:})dnl -dnl -dnl For arches where you can install from NFS, $1 should be set to "NFS", -dnl otherwise there should be no parameter. -define({:-OpenBSDCommonFS-:}, -{:- Common file system installations: - The following instructions are common to installations - from mounted disk partitions{:--:}ifelse(X$1,XNFS,{:-, NFS mounted directories and - CD-ROMs-:},{:- and CD-ROMs-:}). - - A list of available distribution sets will be listed. - You may individually select distribution sets to install - or enter `all' to install all of the sets (which is what - most users will want to do). You may also enter `list' - to get a file list or `done' when you are done selecting - distribution sets. You may also use wildcards in place of - a file name, e.g. `*.tgz' or even `base*|comp*'. It is - also possible to enter an arbitrary filename and have it - treated as a file set. - - Once you have selected the file sets you want to install - and entered `done' you will be prompted to verify that - you really do want to extract file sets. Assuming you - acquiesce, the files will begin to extract. If not, you - will be given the option of installing sets via one of - the other install methods.-:})dnl -dnl -define({:-OpenBSDCommonURL-:}, -{:- Common URL installations: - Once you have entered the required information, the - install program will fetch a file list and present - a list of all the distribution sets that were found - in the specified directory. (If no valid sets were found, - you will be notified and given the option of unpacking - any gzipped tar files found or getting a file list if - none were found.) - - At this point you may individually select distribution - sets to install or enter `all' to install all of the - sets (which is what most users will want to do). You - may also enter `list' to get a file list or `done' when - you are done selecting distribution sets. You may also - use wildcards in place of a file name, e.g. `*.tgz' or - even `base*|comp*'. It is also possible to enter an - arbitrary filename and have it treated as a file set. - - Once you have selected the file sets you want to install - and entered `done' you will be prompted to verify that - you really do want to download and install the files. - Assuming you acquiesce, the files will begin to download - and unpack. If not, you will be given the option of - installing sets via one of the other install methods.-:})dnl +dnl Then refer to the section named "installation set selection" +dnl below. + Then refer to the next section.-:})dnl +dnl +define({:-OpenBSDCommonInstall-:}, +{:- Installation set selection: + A list of available distribution sets found on the + given location will be listed. + + You may individually select distribution sets to install, + by entering their name, or wildcards (e.g. `*.tgz' or + `base*|comp*', or `all' to select all the sets (which + is what most users will want to do). + You may also enter `abort' to deselect everything and + restart the selection from scratch, or unselect sets + by entering their name prefixed with `-' (e.g. `-x*'). + + It is also possible to enter an arbitrary filename and + have it treated as a file set. + + When you are done selecting distribution sets, enter + `done'. The files will begin to extract.-:})dnl dnl dnl Description of the end of the installation procedure. -dnl This is split in multiple parts because not all platforms will -dnl suggest setting the aperture sysctl or configuring a serial console. dnl -dnl (the first blank line is intentional) define({:-OpenBSDInstallWrapup-:}, -{:- - When all the selected distribution sets have been extracted, you - will be asked whether you want to start shhd(8) by default, - as well as your ntp server (ntpd(8) will not be started by - default if you don't provide a server).-:})dnl -dnl -define({:-OpenBSDInstallAperture-:}, -{:- You will next be asked whether you intend to run the X Window - System on your machine. The install program needs to know - this, to change a configuration setting controlling whether - the X server will be able to access the xf86(4) driver; it - is not necessary to answer `y' to this question if you only - intend to run X client programs on a remote display.-:})dnl -dnl -define({:-OpenBSDInstallConsole-:}, -{:- By default, the OpenBSD/MACHINE installation will only start - terminals on the primary display device. - - If you are installing using a serial console, the installer - program will ask you whether you want to also enable an - additional terminal on that line, and will allow you to select - the line speed.-:})dnl -dnl -define({:-OpenBSDInstallWrapupPart2-:}, -{:- The last thing you'll need to configure is the time zone your - system will be using. For this work properly, it is expected - that you have installed at least the "base{:--:}OSrev", "etc{:--:}OSrev", +{:- After the files have been extracted, you will be given the choice + to select a new location from which to install distribution sets. + If there have been errors extracting the sets from the previous + location, or if some sets have been missing, this allows you to + select a better source. + + Also, if the installation program complains that the distribution + sets you have been using do not match their recorded checksums, you + might want to check your installation source (although this can + happen between releases, if a snapshot is being updated on an FTP + or HTTP server with newer files while you are installing). + +ifelse(MDTZ,,dnl +{:- The last thing you'll need to configure is the time zone your system + will be using. For this to work properly, it is expected that you + have installed at least the "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets. +-:},dnl +{:- The last thing you might need to configure, if you did not get + the chance to earlier, is the time zone your system will be using. + For this work properly, it is expected that you have installed at + least the "base{:--:}OSrev", "etc{:--:}OSrev", and "bsd" distribution sets. +-:})dnl - The installer program will the proceed to create all the device - nodes needed by the installed system, and will unmount the - file systems.-:})dnl + The installation program will then proceed to save the system + configuration, create all the device nodes needed by the installed + system, and will install bootblocks on the root disk. +ifelse(MDSMP,,,{:- + + On multiprocessor systems, if the bsd.mp kernel has been installed, + it will be renamed to `bsd', which is the default kernel the boot + blocks look for. The single processor kernel, `bsd', will be + available as `bsd.sp'.-:})dnl +-:})dnl dnl -define({:-OpenBSDCongratulations-:}, -{:-Congratulations, you have successfully installed OpenBSD OSREV. When you +define({:-OpenBSDCongratulations-:},{:- +Congratulations, you have successfully installed OpenBSD OSREV. When you reboot into OpenBSD, you should log in as "root" at the login prompt. You should create yourself an account and protect it and the "root" account with good passwords. @@ -736,6 +800,9 @@ Boot from $1. When prompted, select the (U)pgrade option rather than the (I)nstall option at the prompt in the install process. +You will be presented with a welcome message and asked if you really wish +to upgrade. + The upgrade script will ask you for the existing root partition, and will use the existing filesystems defined in /etc/fstab to install the new system in. It will also use your existing network parameters. @@ -895,8 +962,8 @@ define({:-OpenBSDXferBareTape-:}, (i.e. read-only).-:})dnl dnl OpenBSDXferBootTape describes how to set up a non-bootable distribution dnl tape, and takes as first argument, the list of X11 sets which may be put -dnl on the tape. Then at least one, and up to three arguments list the first -dnl files to be put on the tape to make it bootable. Each filename can be +dnl on the tape. Then at least one, and up to three arguments list the first +dnl files to be put on the tape to make it bootable. Each filename can be dnl followed by dd(1) arguments (such as conv=sync). define({:-OpenBSDXferBootTape-:}, {:-Creating an (optionally bootable) installation tape: diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents index 3eb17c188d7..2b1b94bc72c 100644 --- a/distrib/notes/mac68k/contents +++ b/distrib/notes/mac68k/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.50 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.51 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -21,9 +21,9 @@ OpenBSDrd DistributionDescription(eleven) -OpenBSDbase(49888006,160478255,shared) +OpenBSDbase(49888006,160478255) -OpenBSDcomp(59123843,199085530,shared) +OpenBSDcomp(59123843,199085530) OpenBSDetc(511799,1522575) diff --git a/distrib/notes/mac68k/features b/distrib/notes/mac68k/features new file mode 100644 index 00000000000..b8bc75ef199 --- /dev/null +++ b/distrib/notes/mac68k/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/mac68k/ramdisk/install.md +dnl and the list files in +dnl src/distrib/mac68k/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m68k)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-:},)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-:},)dnl diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install index 2f2d17a357c..411cfc0a3e2 100644 --- a/distrib/notes/mac68k/install +++ b/distrib/notes/mac68k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.37 2008/08/06 20:30:08 miod Exp $ +dnl $OpenBSD: install,v 1.38 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude OpenBSDInstallPart2 @@ -10,15 +10,9 @@ OpenBSDInstallPart2 Performa 476 models it is also necessary to activate the video address hack. Now boot the kernel. -OpenBSDBootMsgs(,"sd0") +OpenBSDInstallPart3(,"sd0") - 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. You will first be given an @@ -76,37 +70,31 @@ OpenBSDInstallPart3 OpenBSD_Swap 'b'. For any other slice do not set any bzb value ('c') except for OpenBSD_Usr, which can be set to 'g'. -OpenBSDInstallPart4 +OpenBSDInstallPart5 OpenBSD/MACHINE can share a disk with Mac OS by using an HFS partitioned disk. For proper layout, the disk should be partitioned with Mac OS first with unused space where OpenBSD can be installed. -OpenBSDInstallPart5(sd0) - -OpenBSDInstallNet({:CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDNFSInstall dnl Not supported dnl OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS(NFS) +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - Once the installation is complete, reboot into Mac OS, and start the BSD/Mac68k Booter again. This time, point to the OpenBSD kernel location on its own partition. You will have to change the kernel name to "bsd" diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents index 1071eed43d1..ee5f30cefc2 100644 --- a/distrib/notes/macppc/contents +++ b/distrib/notes/macppc/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 OpenBSDdistsets @@ -17,9 +17,9 @@ dnl bsd.tbxi DistributionDescription(eleven) -OpenBSDbase(62017179,180003616,shared) +OpenBSDbase(62017179,180003616) -OpenBSDcomp(111483183,281809861,shared) +OpenBSDcomp(111483183,281809861) OpenBSDetc(516479,1539387) diff --git a/distrib/notes/macppc/features b/distrib/notes/macppc/features new file mode 100644 index 00000000000..48efb0088d0 --- /dev/null +++ b/distrib/notes/macppc/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/macppc/ramdisk/install.md +dnl and the list files in +dnl src/distrib/macppc/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},powerpc)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-:},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-:},)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-:},)dnl diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install index ba279dd0907..2c08a30d5a9 100644 --- a/distrib/notes/macppc/install +++ b/distrib/notes/macppc/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.28 2008/10/16 00:05:09 krw Exp $ +dnl $OpenBSD: install,v 1.29 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude Before you begin, you should decide if OpenBSD is to be installed @@ -33,15 +33,9 @@ OpenBSDInstallPart2 (Refer to "Preparing your System for OpenBSD Installation" above for information on how to access and boot from Open Firmware.) -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 edit or create a disk label for the disk OpenBSD is being installed on. If there are any existing @@ -109,9 +103,9 @@ 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.-:}) OpenBSD/MACHINE can share a disk with Mac OS or Mac OS X by using an HFS partitioned disk. For proper layout, the disk should be @@ -125,32 +119,22 @@ OpenBSDInstallPart4({:- If you have DOS or Linux If the disk is partitioned using MBR, the bootloader is automatically installed. However because fdisk is not LBA knowledgeable it may be necessary to run the 'b' command in - disklabel to allow OpenBSD to use the entire disk.-:}) - -OpenBSDInstallPart5(wd0) + disklabel to allow OpenBSD to use the entire disk. -OpenBSDInstallNet({:-CD-ROM, -:}) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDDISKInstall(,,{:- or MS-DOS-:}) -OpenBSDCommonFS +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallAperture - -OpenBSDInstallConsole - -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents index 186b7ccdbf7..e6415f3ac59 100644 --- a/distrib/notes/mvme68k/contents +++ b/distrib/notes/mvme68k/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.33 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.34 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -25,9 +25,9 @@ Useful Media" for more information. DistributionDescription(eleven) -OpenBSDbase(49804334,160362444,shared) +OpenBSDbase(49804334,160362444) -OpenBSDcomp(59120349,199074790,shared) +OpenBSDcomp(59120349,199074790) OpenBSDetc(510472,1358753) diff --git a/distrib/notes/mvme68k/features b/distrib/notes/mvme68k/features new file mode 100644 index 00000000000..7b23f672c29 --- /dev/null +++ b/distrib/notes/mvme68k/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/mvme68k/ramdisk/install.md +dnl and the list files in +dnl src/distrib/mvme68k/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m68k)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-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install index 4af1f991f3d..a5e8020f9a7 100644 --- a/distrib/notes/mvme68k/install +++ b/distrib/notes/mvme68k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.33 2009/03/01 22:08:10 miod Exp $ +dnl $OpenBSD: install,v 1.34 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -251,41 +251,29 @@ OpenBSDInstallPart2 diskless setup isn't correct, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(,"sd0") - - 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 +OpenBSDInstallPart3(,"sd0") OpenBSDInstallPart4 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall(3) - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS(NFS) - -OpenBSDCommonURL +OpenBSDTAPEInstall(3) -OpenBSDInstallWrapup +OpenBSDCommonInstall -OpenBSDInstallWrapupPart2 +OpenBSDInstallWrapup OpenBSDCongratulations diff --git a/distrib/notes/mvme88k/features b/distrib/notes/mvme88k/features new file mode 100644 index 00000000000..785c021353c --- /dev/null +++ b/distrib/notes/mvme88k/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/mvme88k/ramdisk/install.md +dnl and the list files in +dnl src/distrib/mvme88k/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},m88k)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-:},)dnl +dnl +dnl define if SMP kernels are provided +define({:-MDSMP-:},1)dnl +dnl +dnl define if shared libraries are provided +define({:-MDSO-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install index eacc3dfe6d9..82893bb1f76 100644 --- a/distrib/notes/mvme88k/install +++ b/distrib/notes/mvme88k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.25 2009/02/15 13:32:47 miod Exp $ +dnl $OpenBSD: install,v 1.26 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -224,41 +224,29 @@ OpenBSDInstallPart2 diskless setup isn't correct, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(,"sd0") - - 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 +OpenBSDInstallPart3(,"sd0") OpenBSDInstallPart4 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall(3) - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS(NFS) - -OpenBSDCommonURL +OpenBSDTAPEInstall(3) -OpenBSDInstallWrapup +OpenBSDCommonInstall -OpenBSDInstallWrapupPart2 +OpenBSDInstallWrapup OpenBSDCongratulations diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents index ed156ab9879..7b06769fa95 100644 --- a/distrib/notes/sgi/contents +++ b/distrib/notes/sgi/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.9 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.10 2009/05/12 21:06:50 miod Exp $ TopPart OpenBSDdistsets @@ -11,9 +11,9 @@ OpenBSDcd DistributionDescription(eleven) -OpenBSDbase(55365300,186700153,shared) +OpenBSDbase(55365300,186700153) -OpenBSDcomp(74964837,259375266,shared) +OpenBSDcomp(74964837,259375266) OpenBSDetc(512942,1526140) diff --git a/distrib/notes/sgi/features b/distrib/notes/sgi/features new file mode 100644 index 00000000000..31065087de3 --- /dev/null +++ b/distrib/notes/sgi/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/sgi/ramdisk/install.md +dnl and the list files in +dnl src/distrib/sgi/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},mips64)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-:},)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-:},)dnl diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install index 1fd18f2d260..8ed4c806ee1 100644 --- a/distrib/notes/sgi/install +++ b/distrib/notes/sgi/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.14 2008/08/25 17:21:56 jsing Exp $ +dnl $OpenBSD: install,v 1.15 2009/05/12 21:06:50 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -53,18 +53,12 @@ OpenBSDInstallPart2 diskless setup isn't correct, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(,"sd0") - - 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 +OpenBSDInstallPart3(,"sd0") OpenBSDInstallPart4 +OpenBSDInstallPart5 + No partitions should overlap with the SGI Volume Header, which by default will use the first 3134 sectors. Additionally, the 'a' partition must be the first partition on the disk, immediately @@ -73,26 +67,20 @@ OpenBSDInstallPart4 partition is not located immediately after the Volume Header the boot loader will not be able to locate and load the kernel. -OpenBSDInstallPart5(sd0) - -OpenBSDInstallNet({:-CD-ROM, NFS -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDNFSInstall -OpenBSDCommonFS(NFS) +OpenBSDCommonInstall -OpenBSDCommonURL +OpenBSDTAPEInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/socppc/contents b/distrib/notes/socppc/contents index ef5c46cc9c5..0888fe08bb6 100644 --- a/distrib/notes/socppc/contents +++ b/distrib/notes/socppc/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.5 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.6 2009/05/12 21:06:51 miod Exp $ TopPart OpenBSDdistsets @@ -14,9 +14,9 @@ OpenBSDrd DistributionDescription(eleven) -OpenBSDbase(61568543,179178806,shared) +OpenBSDbase(61568543,179178806) -OpenBSDcomp(111476336,281757131,shared) +OpenBSDcomp(111476336,281757131) OpenBSDetc(516077,1538641) diff --git a/distrib/notes/socppc/features b/distrib/notes/socppc/features new file mode 100644 index 00000000000..4710a3ab101 --- /dev/null +++ b/distrib/notes/socppc/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/socppc/ramdisk/install.md +dnl and the list files in +dnl src/distrib/socppc/ramdisk/list +dnl +dnl ==== +dnl +dnl architecture name (for the packages directory) +define({:-MACHINE_ARCH-:},powerpc)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-:},)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-:},)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-:},)dnl diff --git a/distrib/notes/socppc/install b/distrib/notes/socppc/install index 203c2328702..9c71ec64cf2 100644 --- a/distrib/notes/socppc/install +++ b/distrib/notes/socppc/install @@ -1,17 +1,11 @@ -dnl $OpenBSD: install,v 1.3 2008/10/16 00:05:09 krw Exp $ +dnl $OpenBSD: install,v 1.4 2009/05/12 21:06:51 miod Exp $ OpenBSDInstallPrelude 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 edit or create a disk label for the disk OpenBSD is being installed on. If there are any existing @@ -27,13 +21,11 @@ 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 Linux partitions - defined on the disk, these will usually show up as partition - 'h', 'i' and so on.-:}) - -OpenBSDInstallPart5(wd0) +OpenBSDInstallPart5({:- + If you have Linux partitions defined on the disk, these will + usually show up as partition 'i', 'j' and so on.-:}) -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall @@ -43,12 +35,8 @@ OpenBSDCDROMInstall OpenBSDDISKInstall({:-"wdN" or -:},,{:-, Linux (ext2) or MS-DOS-:}) -OpenBSDCommonFS - -OpenBSDCommonURL +OpenBSDCommonInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents index 6097c73c9f1..3afcd1a66bd 100644 --- a/distrib/notes/sparc/contents +++ b/distrib/notes/sparc/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.60 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.61 2009/05/12 21:06:51 miod Exp $ TopPart OpenBSDminiroot @@ -39,9 +39,9 @@ OpenBSDfloppydesc(single,The) DistributionDescription(eleven) -OpenBSDbase(43840925,131855274,shared) +OpenBSDbase(43840925,131855274) -OpenBSDcomp(71104591,261759062,shared) +OpenBSDcomp(71104591,261759062) OpenBSDetc(517053,1543992) diff --git a/distrib/notes/sparc/features b/distrib/notes/sparc/features new file mode 100644 index 00000000000..8b2a85ee94b --- /dev/null +++ b/distrib/notes/sparc/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/sparc/install.md +dnl and the list files in +dnl src/distrib/sparc/{miniroot,ramdisk}/list +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-:},)dnl +dnl +dnl define if serial consoles needs to be enabled in /etc/ttys +dnl (i.e. md_consoleinfo is not empty) +define({:-MDSERCONS-:},)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/sparc/install b/distrib/notes/sparc/install index a3140f6f976..0caf9ed1ae7 100644 --- a/distrib/notes/sparc/install +++ b/distrib/notes/sparc/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.67 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.68 2009/05/12 21:06:51 miod Exp $ OpenBSDInstallPrelude({:-SMD disks-:}) There are several ways to install OpenBSD onto a disk. The easiest way @@ -172,41 +172,29 @@ OpenBSDInstallPart2 is bad, your diskless setup isn't correct, or you may have a hardware or configuration problem. -OpenBSDBootMsgs(SMD drives are noisy and weight a ton per kilobyte and scare +OpenBSDInstallPart3(SMD drives are noisy and weight a ton per kilobyte and scare cats,"sd0" for SCSI drives,{:-and "xd0" or "xy0" for SMD drives-:}) - 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 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall(2) - OpenBSDCDROMInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS - -OpenBSDCommonURL +OpenBSDCommonInstall -OpenBSDInstallWrapup +OpenBSDTAPEInstall(2) -OpenBSDInstallWrapupPart2 +OpenBSDInstallWrapup After completing an installation: diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents index 7a3804d3b61..6d3f3f7c1d6 100644 --- a/distrib/notes/sparc64/contents +++ b/distrib/notes/sparc64/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.42 2009/02/28 20:53:00 miod Exp $ +dnl $OpenBSD: contents,v 1.43 2009/05/12 21:06:51 miod Exp $ TopPart OpenBSDminiroot @@ -48,9 +48,9 @@ OpenBSDfloppydesc(two,Each,s) DistributionDescription(eleven) -OpenBSDbase(52866597,169494547,shared) +OpenBSDbase(52866597,169494547) -OpenBSDcomp(105724146,353743431,shared) +OpenBSDcomp(105724146,353743431) OpenBSDetc(517020,1544285) diff --git a/distrib/notes/sparc64/features b/distrib/notes/sparc64/features new file mode 100644 index 00000000000..5abea30818c --- /dev/null +++ b/distrib/notes/sparc64/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/sparc64/common/install.md +dnl and the list files in +dnl src/distrib/sparc64/{bsd.rd,ramdisk,ramdiskB}/list +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-:},)dnl +dnl +dnl define if serial consoles needs to be enabled in /etc/ttys +dnl (i.e. md_consoleinfo is not empty) +define({:-MDSERCONS-:},)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-:},)dnl diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index cdc9631bafd..25e26f886d0 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.41 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.42 2009/05/12 21:06:51 miod Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -98,41 +98,27 @@ OpenBSDInstallPart2 is bad, your diskless setup isn't correct, or you may have a hardware or configuration problem. -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 -OpenBSDInstallPart5(wd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, -:},nofloppy) +OpenBSDInstallPart6({:-CD-ROM, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:}) -OpenBSDCommonFS - -OpenBSDCommonURL +OpenBSDCommonInstall -OpenBSDInstallWrapup - -OpenBSDInstallAperture +OpenBSDTAPEInstall -OpenBSDInstallWrapupPart2 +OpenBSDInstallWrapup After completing an installation: diff --git a/distrib/notes/vax/features b/distrib/notes/vax/features new file mode 100644 index 00000000000..d57dc107c4c --- /dev/null +++ b/distrib/notes/vax/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/vax/install.md +dnl and the list files in +dnl src/distrib/vax/{common,ramdisk}/list +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-:},)dnl +dnl +dnl define if serial consoles needs to be enabled in /etc/ttys +dnl (i.e. md_consoleinfo is not empty) +define({:-MDSERCONS-:},)dnl +dnl +dnl define if SMP kernels are provided +define({:-MDSMP-:},)dnl +dnl +dnl define if shared libraries are provided +define({:-MDSO-:},)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-:},)dnl diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install index a23aaffb30d..c7661ef478b 100644 --- a/distrib/notes/vax/install +++ b/distrib/notes/vax/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.21 2008/08/05 22:58:01 miod Exp $ +dnl $OpenBSD: install,v 1.22 2009/05/12 21:06:51 miod Exp $ OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:}) For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via @@ -91,41 +91,29 @@ OpenBSDInstallPart2 hardware or configuration problem. -OpenBSDBootMsgs(the quick brown vax jumped over the lazy pdp,"sd0" for SCSI drives,{:-"ra0" for MSCP +OpenBSDInstallPart3(the quick brown vax jumped over the lazy pdp,"sd0" for SCSI drives,{:-"ra0" for MSCP drives-:}, or "hd0" for MFM drives) - 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 -OpenBSDInstallPart5(sd0) +OpenBSDInstallPart5 -OpenBSDInstallNet({:-CD-ROM, NFS, -:}) +OpenBSDInstallPart6({:-CD-ROM, NFS, -:}) OpenBSDFTPInstall OpenBSDHTTPInstall -OpenBSDTAPEInstall - OpenBSDCDROMInstall OpenBSDNFSInstall OpenBSDDISKInstall(,{:-only -:}) -OpenBSDCommonFS(NFS) +OpenBSDTAPEInstall -OpenBSDCommonURL +OpenBSDCommonInstall OpenBSDInstallWrapup -OpenBSDInstallWrapupPart2 - OpenBSDCongratulations 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 |