From db0bfcd5774e1ae9024999ff2d875213a063b674 Mon Sep 17 00:00:00 2001 From: doug Date: Wed, 6 Aug 2014 02:34:23 +0000 Subject: [PATCH] Add signify instructions plus miniroot and install56.fs for amd64/i386 ok deraadt@ --- distrib/notes/INSTALL | 20 ++++++++++++-- distrib/notes/amd64/contents | 7 ++++- distrib/notes/amd64/install | 18 ++++++------- distrib/notes/amd64/xfer | 10 ++++--- distrib/notes/i386/contents | 7 ++++- distrib/notes/i386/install | 17 ++++++------ distrib/notes/i386/xfer | 10 ++++--- distrib/notes/m4.common | 52 +++++++++++++++++++++++++++++++----- 8 files changed, 105 insertions(+), 36 deletions(-) diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL index 457e17bd727..a54bdc2c46c 100644 --- a/distrib/notes/INSTALL +++ b/distrib/notes/INSTALL @@ -1,4 +1,4 @@ -dnl $OpenBSD: INSTALL,v 1.48 2014/04/22 10:50:15 henning Exp $ +dnl $OpenBSD: INSTALL,v 1.49 2014/08/06 02:34:23 doug Exp $ include(INCLUDE/../m4.common)dnl includeit(features)dnl INSTALLATION NOTES for OpenBSD/MACHINE OSREV @@ -76,6 +76,22 @@ OpenBSD System Requirements and Supported Devices: includeit(hardware) +Verifying the OpenBSD Installation Media: +----------------------------------------- + +As of OpenBSD 5.5, installations are able to verify files for the next +release. The OpenBSD OSREV release was signed with the +/etc/signify/openbsd-{:--:}OSrev-base.pub release key. + +If you have an existing OpenBSD 5.5 or higher installation, you can run +signify(1) to verify the signature and checksum. For example, run the following +to verify that the cd{:--:}OSrev.iso file was distributed by the OpenBSD team: + signify -C -p /etc/signify/openbsd-{:--:}OSrev-base.pub -x SHA256.sig cd{:--:}OSrev.iso + +If you are unable to run or compile signify(1), use sha256(1) with the SHA256 +file to see if a file was corrupt during the transfer. + + Getting the OpenBSD System onto Useful Media: --------------------------------------------- @@ -188,7 +204,7 @@ dnl dnl Use of 'sendbug' is encouraged, however, because bugs reported with it dnl are entered into the OpenBSD bugs database, and thus can't slip through dnl the cracks. -dnl +dnl As a favor, please avoid mailing huge documents or files to the mailing lists. Instead, put the material you would have sent on a web server, then mail the appropriate list about it, or if diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents index 9c09e0ea664..582d44a2c89 100644 --- a/distrib/notes/amd64/contents +++ b/distrib/notes/amd64/contents @@ -1,6 +1,9 @@ -dnl $OpenBSD: contents,v 1.33 2014/07/29 02:57:09 miod Exp $ +dnl $OpenBSD: contents,v 1.34 2014/08/06 02:34:23 doug Exp $ TopPart +OpenBSDminiroot + It can be copied to a small USB key to start the install. + OpenBSDfloppy pxeboot amd64-specific second-stage PXE bootstrap (for @@ -16,6 +19,8 @@ OpenBSDrd OpenBSDinstalliso +OpenBSDinstallfs + OpenBSDcd cdbr First-stage CD bootstrap (boot sector), which loads diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install index 02e11c09877..9602890834b 100644 --- a/distrib/notes/amd64/install +++ b/distrib/notes/amd64/install @@ -1,21 +1,21 @@ -dnl $OpenBSD: install,v 1.17 2014/02/27 19:33:51 tedu Exp $ +dnl $OpenBSD: install,v 1.18 2014/08/06 02:34:23 doug Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way, -should your computer support it, is to boot off the OpenBSD CD-ROM, or -off the bootable CD-ROM mini image. Otherwise, you can boot from a 3.5" -1.44MB floppy disk if your machine has a floppy drive. If your machine -supports PXE network boots, you could try to configure a server for a -network install. +should your computer support it, is to boot off the OpenBSD CD-ROM, +USB key, or off one of the bootable CD-ROM mini images. Otherwise, you +can boot from a 3.5" 1.44MB floppy disk if your machine has a floppy drive. +If your machine supports PXE network boots, you could try to configure a +server for a network install. OpenBSDInstallPart2 - If you are using CD-ROM or floppy media, ensure the disk is in - the drive before starting. + If you are using CD-ROM, USB key or floppy media, ensure the media is + present before starting. Reboot the computer to begin the install. You might have to play with your BIOS options to get the computer to boot from the - correct installation media (floppy, CD, or network/PXE) rather + correct installation media (floppy, CD, USB key or network/PXE) rather than from the hard disk. If you are installing across the network with PXE, you will need diff --git a/distrib/notes/amd64/xfer b/distrib/notes/amd64/xfer index 40a012f2f18..e8b7c4686f4 100644 --- a/distrib/notes/amd64/xfer +++ b/distrib/notes/amd64/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.13 2014/02/27 20:11:25 tedu Exp $ +dnl $OpenBSD: xfer,v 1.14 2014/08/06 02:34:23 doug Exp $ Installation is supported from several media types, including: CD-ROM @@ -10,9 +10,9 @@ dnl Remote NFS partition HTTP If you can't (or don't want to) boot off a CD-ROM, you can use a floppy -disk (1.44MB required). Failing that, if your computer supports PXE, you -can prepare a server to start the install across the network, but you will -still need the install sets available on one of the above media types. +disk (1.44MB required) or a USB key. Failing that, if your computer supports +PXE, you can prepare a server to start the install across the network, but you +will still need the install sets available on one of the above media types. OpenBSDXferCDROM @@ -20,6 +20,8 @@ OpenBSDXferFloppyFromDOS OpenBSDXferFloppyFromUNIX +OpenBSDXferUSBFromUNIX + Creating a PXE network bootable setup using OpenBSD or other Un*x-like system: In order to start the install via PXE, you will need to set up a diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents index c9f7ad35c64..5dc183dbf5c 100644 --- a/distrib/notes/i386/contents +++ b/distrib/notes/i386/contents @@ -1,6 +1,9 @@ -dnl $OpenBSD: contents,v 1.74 2014/07/29 02:57:09 miod Exp $ +dnl $OpenBSD: contents,v 1.75 2014/08/06 02:34:23 doug Exp $ TopPart +OpenBSDminiroot + It can be copied to a small USB key to start the install. + OpenBSDfloppy floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; this one @@ -25,6 +28,8 @@ OpenBSDrd OpenBSDinstalliso +OpenBSDinstallfs + OpenBSDcd cdbr First-stage CD bootstrap (boot sector), which loads diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install index 188170bec4d..e95f635138d 100644 --- a/distrib/notes/i386/install +++ b/distrib/notes/i386/install @@ -1,22 +1,21 @@ -dnl $OpenBSD: install,v 1.50 2014/02/27 19:33:51 tedu Exp $ +dnl $OpenBSD: install,v 1.51 2014/08/06 02:34:23 doug Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way, -should your computer support it, is to boot off the OpenBSD CD-ROM, or -off one of the bootable CD-ROM mini images. Otherwise, you can boot -from a 3.5" 1.44MB floppy disk if your machine has a floppy drive. +should your computer support it, is to boot off the OpenBSD CD-ROM, +USB key, or off one of the bootable CD-ROM mini images. Otherwise, you +can boot from a 3.5" 1.44MB floppy disk if your machine has a floppy drive. If your machine supports PXE network boots, you could try to configure a -server for a network install. If your machine can boot from a USB device, -having a USB key with a minimal install is another possibility. +server for a network install. OpenBSDInstallPart2 - If you are using CD-ROM or floppy media, ensure the disk is in - the drive before starting. + If you are using CD-ROM, USB key or floppy media, ensure the media is + present before starting. Reboot the computer to begin the install. You might have to play with your BIOS options to get the computer to boot from the - correct installation media (floppy, CD, or network/PXE) rather + correct installation media (floppy, CD, USB key or network/PXE) rather than from the hard disk. If you are installing across the network with PXE, you will need diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer index 24a2696e623..5e12061ca5d 100644 --- a/distrib/notes/i386/xfer +++ b/distrib/notes/i386/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.32 2014/02/27 20:11:25 tedu Exp $ +dnl $OpenBSD: xfer,v 1.33 2014/08/06 02:34:23 doug Exp $ Installation is supported from several media types, including: CD-ROM @@ -10,9 +10,9 @@ dnl Remote NFS partition HTTP If you can't (or don't want to) boot off a CD-ROM, you can use a floppy -disk (1.44MB required). Failing that, if your computer supports PXE, you -can prepare a server to start the install across the network, but you will -still need the install sets available on one of the above media types. +disk (1.44MB required) or a USB key. Failing that, if your computer supports +PXE, you can prepare a server to start the install across the network, but you +will still need the install sets available on one of the above media types. OpenBSDXferCDROM @@ -20,6 +20,8 @@ OpenBSDXferFloppyFromDOS OpenBSDXferFloppyFromUNIX +OpenBSDXferUSBFromUNIX + Creating a PXE network bootable setup using OpenBSD or other Un*x-like system: In order to start the install via PXE, you will need to set up a diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 82aa5c4e419..033a3fa21d1 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.109 2014/05/09 21:15:17 rpe Exp $ +dnl $OpenBSD: m4.common,v 1.110 2014/08/06 02:34:23 doug Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries dnl @@ -133,7 +133,7 @@ define({:-OpenBSDetc-:}, system from scratch, but should NOT be used if you are upgrading. (If you are upgrading, it's recommended that you get a copy of this set and CAREFULLY upgrade your - configuration files by hand; see the section named + configuration files by hand; see the section named "Upgrading a previously-installed OpenBSD System" below.)-:},.)showsize($1,$2)-:})dnl dnl dnl @@ -247,6 +247,11 @@ define({:-OpenBSDminiroot-:}, for some reason can't or don't want to use the ramdisk installation method.-:})dnl dnl +define({:-OpenBSDinstallfs-:}, +{:- install{:--:}OSrev.fs A boot and installation image which contains + the base and X sets. An install or upgrade can be + done with a USB key without network connectivity.-:})dnl +dnl dnl dnl ========== Various Install Instructions dnl (usually used by arch/install) @@ -705,7 +710,7 @@ define({:-OpenBSDInstallWrapup-:}, 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 @@ -912,7 +917,7 @@ define({:-OpenBSDXferCDROM-:}, OpenBSD users should be able to do this with the cdio command. "cdio tao install{:--:}OSrev.iso" - Users of other operating systems should consult the + Users of other operating systems should consult the appropriate documentation.-:})dnl dnl define({:-OpenBSDXferFloppyFromDOS-:}, @@ -926,7 +931,7 @@ define({:-OpenBSDXferFloppyFromDOS-:}, browser. In either case, take care to do "binary" transfers, since these are images files and any DOS cr/lf translations or Control-z EOF interpretations will result in corrupted transfers. - + You will also need to go to the "tools" directory and grab a copy of the ntrw.exe utility. Run it with the correct arguments like this "ntrw :" @@ -937,7 +942,7 @@ dnl define({:-OpenBSDXferFloppyFromUNIX-:}, {:-Creating a bootable floppy disk using a Un*x-like system: - First, you will need obtain a local copy of the bootable filesystem + First, you will need to obtain a local copy of the bootable filesystem image as described above. You should use the signify(1) and sha256(1) commands to verify the integrity of the images with the SHA256.sig file on the mirror site. @@ -963,6 +968,41 @@ define({:-OpenBSDXferFloppyFromUNIX-:}, Note that, when installing, the boot floppy can be write-protected (i.e. read-only).-:})dnl +dnl +define({:-OpenBSDXferUSBFromUNIX-:}, +{:-Creating a bootable USB key using a Un*x-like system: + + Some older systems may not be able to boot from USB keys or require + changing boot priority. Check your BIOS settings if you run into + problems. + + First, you will need to obtain a local copy of the bootable filesystem + image miniroot{:--:}OSrev.fs or install{:--:}OSrev.fs as described above. + You should use the signify(1) and sha256(1) commands to verify + the integrity of the images with the SHA256.sig file on the mirror site. + + Next, use the dd(1) utility to copy the file to the USB storage device. + The command would likely be, under OpenBSD: + dd if=miniroot{:--:}OSrev.fs of=/dev/rsdNc bs=1m + + where N is the device number. You can find the correct device number + by checking dmesg(8) when inserting the media. + + If you are using another operating system, you may have to adapt + this to conform to local naming conventions for the USB key and + options suitable for copying to a "raw" disk image. The key + issue is that the device name used for the USB key *must* be one + that refers to the correct block device, not a partition or + compatibility mode, and the copy command needs to be compatible + with the requirement that writes to a raw device must be in + multiples of 512-byte blocks. The variations are endless and + beyond the scope of this document. + + If you're doing this on the system you intend to boot the USB key on, + copying the image back to a file and doing a compare or checksum + is a good way to verify that the USB key is readable and free of + read/write errors.-:})dnl +dnl dnl OpenBSDXferNFS [(noupgrade)] define({:-OpenBSDXferNFS-:}, {:-To install OpenBSD using a remote partition, mounted via -- 2.20.1