diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-05-17 17:04:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2020-05-17 17:04:30 +0000 |
| commit | 3a070d405256a4bc550131cac65c4e5f68a4e2f2 (patch) | |
| tree | ad8706884e6d9c852709d6122e6a3453fab0ef5a /distrib | |
| parent | 71c1251d069316abdb33549d89b70dfd45f2f437 (diff) | |
Change install images called *.fs to *.img. These are UFS filesystem images,
but additionally have a bootblock in the first 8K (since UFS does not use that
space). There are some UEFI direct-from-internet bootloaders that require
the name *.img. So this makes things more convenient for those, while keeping
it consistant in all architectures.
ok kettenis beck kn
Diffstat (limited to 'distrib')
34 files changed, 91 insertions, 91 deletions
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile index d27c1fc03ca..3b4582c2049 100644 --- a/distrib/alpha/miniroot/Makefile +++ b/distrib/alpha/miniroot/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.15 2019/11/19 09:46:22 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 5760 FSDISKTYPE= fakeramdisk CDROM= cd${OSrev}.iso diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 47ea3f83974..50465fb538e 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.34 2019/11/15 03:10:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.35 2020/05/17 17:04:27 deraadt Exp $ -FS= install${OSrev}.fs +FS= install${OSrev}.img FSSIZE= 929792 FSTYPE= install360 CDROM= install${OSrev}.iso diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index e7a6bb23bee..676818bb344 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.8 2019/06/07 14:39:56 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2020/05/17 17:04:27 deraadt Exp $ -FS= floppy${OSrev}.fs +FS= floppy${OSrev}.img FSSIZE= 2880 FSDISKTYPE= floppy3 MOUNT_POINT= /mnt @@ -81,7 +81,7 @@ install: clean cleandir: rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ - *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ + *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.img \ lib*.a lib*.olist instbin.map boot instbin.conf ${FS} rm -rf mr.fs.d diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index aad730de7f5..84cb5853ca3 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.20 2019/06/07 14:39:56 deraadt Exp $ +# $OpenBSD: Makefile,v 1.21 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 9600 FSDISKTYPE= mini34 CDROM= cd${OSrev}.iso @@ -107,7 +107,7 @@ install: clean cleandir: rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ - *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ + *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.img \ lib*.a lib*.olist instbin.map boot instbin.conf ${FS} rm -rf mr.fs.d rm -f ${CDROM} diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile index a3be237cb3c..bdbc795af11 100644 --- a/distrib/arm64/ramdisk/Makefile +++ b/distrib/arm64/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.18 2019/11/17 06:03:39 jsg Exp $ +# $OpenBSD: Makefile,v 1.19 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 67584 FSDISKTYPE= miniroot MOUNT_POINT= /mnt diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index bd6e132572f..c454c20dd8c 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.25 2019/10/31 00:37:25 jsg Exp $ +# $OpenBSD: Makefile.inc,v 1.26 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot-${BOARD}-${OSrev}.fs +FS= miniroot-${BOARD}-${OSrev}.img FSSIZE= 67584 # ffs+msdos, actually MOUNT_POINT= /mnt diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 0bc5ab254f0..8f8e3ae334f 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.45 2019/05/12 16:05:44 deraadt Exp $ +# $OpenBSD: Makefile,v 1.46 2020/05/17 17:04:27 deraadt Exp $ -LIF= lif${OSrev}.fs +LIF= lif${OSrev}.img CDROM= cd${OSrev}.iso MTREE= ${UTILS}/mtree.conf RAMDISK= RAMDISK diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile index 0b53c62720e..63113280b6d 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.26 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.27 2020/05/17 17:04:27 deraadt Exp $ -FS= install${OSrev}.fs +FS= install${OSrev}.img FSSIZE= 921600 FSDISKTYPE= install360 CDROM= install${OSrev}.iso diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index 0af2eeaec0a..5542f7e2cd4 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.7 2019/06/07 14:39:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2020/05/17 17:04:27 deraadt Exp $ -FS= floppy${OSrev}.fs +FS= floppy${OSrev}.img FSSIZE= 2880 FSDISKTYPE= floppy3 MOUNT_POINT= /mnt @@ -82,7 +82,7 @@ install: clean cleandir: rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ - *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ + *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.img \ lib*.a lib*.olist instbin.map boot instbin.conf ${FS} rm -rf mr.fs.d diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index e35652355d9..b639b86bd9f 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.15 2019/12/01 05:16:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 8064 FSDISKTYPE= mini34 CDROM= cd${OSrev}.iso @@ -104,7 +104,7 @@ install: clean cleandir: rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ - *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ + *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.img \ lib*.a lib*.olist instbin.map boot instbin.conf ${FS} rm -rf mr.fs.d rm -f ${CDROM} diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index f2fefbfa953..56a8ec11539 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.30 2019/05/03 20:03:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.31 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 5120 FSDISKTYPE= miniroot2.5M MOUNT_POINT= /mnt diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index 6eab69e407b..b236a4f07ca 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.26 2020/03/05 16:33:32 otto Exp $ +# $OpenBSD: Makefile,v 1.27 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 18432 FSDISKTYPE= miniroot CDROM= cd${OSrev}.iso diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 37ce8e695b0..be32707fc96 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.28 2019/07/31 11:19:39 aoyama Exp $ +# $OpenBSD: Makefile,v 1.29 2020/05/17 17:04:27 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 8192 FSDISKTYPE= miniroot MOUNT_POINT= /mnt diff --git a/distrib/notes/alpha/xfer b/distrib/notes/alpha/xfer index 9fb9074e4b5..d0a4bc5db2a 100644 --- a/distrib/notes/alpha/xfer +++ b/distrib/notes/alpha/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.34 2020/04/28 13:02:10 benno Exp $ +dnl $OpenBSD: xfer,v 1.35 2020/05/17 17:04:27 deraadt Exp $ Installation is supported from several media types, including: CD-ROM @@ -18,7 +18,7 @@ If you do not have a CD-ROM drive on your alpha: You must use a Unix-like system to write the miniroot image to the hard disk you will be using for OpenBSD/MACHINE. You should use the "dd" command to copy the file system image - (miniroot{:--:}OSrev.fs) directly to the raw 'c' + (miniroot{:--:}OSrev.img) directly to the raw 'c' device (whole disk) of the target hard disk. It is suggested that you read the dd(1) manual page or ask your system administrator to determine the correct set of arguments to use; diff --git a/distrib/notes/arm64/prep b/distrib/notes/arm64/prep index e74ad22f3a6..03a8b09c437 100644 --- a/distrib/notes/arm64/prep +++ b/distrib/notes/arm64/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.10 2020/04/19 23:41:19 sthen Exp $ +dnl $OpenBSD: prep,v 1.11 2020/05/17 17:04:27 deraadt Exp $ Please be aware that OpenBSD support for this platform is far from complete. @@ -15,7 +15,7 @@ SPI flash. If the miniroot images are used, U-Boot and DTB files are distributed as part of the miniroot disk images. OpenBSD can be installed onto a disk by copying the miniroot for your -board "miniroot{:--:}OSrev.fs" image to an SD card. +board "miniroot{:--:}OSrev.img" image to an SD card. Booting from an SD card: @@ -26,7 +26,7 @@ Booting from an SD card: Use the dd(1) utility to copy the miniroot to the SD card. The command would likely be, under OpenBSD: - dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c bs=1m + dd if=miniroot{:--:}OSrev.img of=/dev/rsd1c bs=1m When you have connected the serial to your computer, a command such as "cu -l cuaU0 -s 115200" (assuming cuaU0 is your serial port device) @@ -61,7 +61,7 @@ Install on Raspberry Pi 4: Use the dd(1) utility to copy the miniroot to the USB storage device. The command would likely be, under OpenBSD: - dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c bs=1m + dd if=miniroot{:--:}OSrev.img of=/dev/rsd1c bs=1m When you have connected the serial to your computer, a command such as "cu -l cuaU0 -s 115200" (assuming cuaU0 is your serial port device) @@ -86,7 +86,7 @@ Install on systems without a supported miniroot: To do so first install the u-boot-aarch64 and dtb packages. Write the provided miniroot image to an SD card: - dd if=miniroot{:--:}OSrev.fs of=/dev/rsdXc bs=1m + dd if=miniroot{:--:}OSrev.img of=/dev/rsdXc bs=1m Add a board specific DTB file (Allwinner and Rockchip U-Boot images come with a default DTB): diff --git a/distrib/notes/armv7/contents b/distrib/notes/armv7/contents index a6db6882b9a..89453edc479 100644 --- a/distrib/notes/armv7/contents +++ b/distrib/notes/armv7/contents @@ -1,27 +1,27 @@ -dnl $OpenBSD: contents,v 1.13 2017/09/25 10:47:46 jsg Exp $ +dnl $OpenBSD: contents,v 1.14 2020/05/17 17:04:28 deraadt Exp $ TopPart - miniroot-am335x-{:--:}OSrev.fs + miniroot-am335x-{:--:}OSrev.img A miniroot filesystem to be used for installation; BeagleBone version. - miniroot-cubie-{:--:}OSrev.fs + miniroot-cubie-{:--:}OSrev.img A miniroot filesystem to be used for installation; Cubieboard2 version. - miniroot-cubox-{:--:}OSrev.fs + miniroot-cubox-{:--:}OSrev.img A miniroot filesystem to be used for installation; CuBox-i version. - miniroot-nitrogen-{:--:}OSrev.fs + miniroot-nitrogen-{:--:}OSrev.img A miniroot filesystem to be used for installation; Nitrogen6x version. - miniroot-panda-{:--:}OSrev.fs + miniroot-panda-{:--:}OSrev.img A miniroot filesystem to be used for installation; PandaBoard (ES) version. - miniroot-wandboard-{:--:}OSrev.fs + miniroot-wandboard-{:--:}OSrev.img A miniroot filesystem to be used for installation; Wandboard version. diff --git a/distrib/notes/armv7/prep b/distrib/notes/armv7/prep index 8a4b16001c4..509e891d91c 100644 --- a/distrib/notes/armv7/prep +++ b/distrib/notes/armv7/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.18 2019/09/25 06:24:46 jsg Exp $ +dnl $OpenBSD: prep,v 1.19 2020/05/17 17:04:28 deraadt Exp $ Please be aware that OpenBSD support for this platform is far from complete. @@ -15,7 +15,7 @@ miniroot images are used, U-Boot and DTB files are distributed as part of the miniroot disk images. OpenBSD can be installed onto a disk by copying the miniroot for your -board "miniroot-board-{:--:}OSrev.fs" image to an SD card. +board "miniroot-board-{:--:}OSrev.img" image to an SD card. Booting from an SD card: @@ -26,7 +26,7 @@ Booting from an SD card: Use the dd(1) utility to copy the miniroot to the hard drive. The command would likely be, under OpenBSD: - dd if=miniroot-am335x-{:--:}OSrev.fs of=/dev/rsd1c + dd if=miniroot-am335x-{:--:}OSrev.img of=/dev/rsd1c When you have connected the BeagleBone to your computer, a command such as "cu -l cuaU0 -s 115200" (assuming cuaU0 is your serial port device) @@ -61,7 +61,7 @@ Install on systems without a supported miniroot: To do so first install the u-boot-arm and dtb packages. Write one of the provided miniroot images to an SD card: - dd if=miniroot-am335x-{:--:}OSrev.fs of=/dev/rsdXc + dd if=miniroot-am335x-{:--:}OSrev.img of=/dev/rsdXc Add a board specific DTB file (Allwinner and Rockchip U-Boot images come with a default DTB): diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents index 8a2f34cfb5f..6eb74bcb98a 100644 --- a/distrib/notes/hppa/contents +++ b/distrib/notes/hppa/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.34 2017/09/25 10:47:46 jsg Exp $ +dnl $OpenBSD: contents,v 1.35 2020/05/17 17:04:28 deraadt Exp $ TopPart OpenBSDdistsets @@ -13,7 +13,7 @@ OpenBSDinstalliso OpenBSDcd - lif{:--:}OSrev.fs A LIF bootable bsd.rd image, suitable for + lif{:--:}OSrev.img A LIF bootable bsd.rd image, suitable for network boot. xxboot The OpenBSD/MACHINE LIF boot block. diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install index 189c465b249..127d821462f 100644 --- a/distrib/notes/hppa/install +++ b/distrib/notes/hppa/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.27 2019/08/01 19:42:52 jmc Exp $ +dnl $OpenBSD: install,v 1.28 2020/05/17 17:04:28 deraadt Exp $ dnl lots of texts coming from {mvme68k,vax}/install initially OpenBSDInstallPrelude @@ -64,7 +64,7 @@ Booting from Network: file is the ethernet address followed by the LIF filename. Here is an example: - 08:00:09:70:c4:11 lif{:--:}OSrev.fs + 08:00:09:70:c4:11 lif{:--:}OSrev.img Then start rbootd (or configure /etc/rc.conf to always start rbootd). Once rbootd is running, the server name will then appear on the MACHINE as part @@ -82,7 +82,7 @@ Booting from Network: subnet 10.0.0.0 netmask 255.0.0.0 { host boron { - filename "lif{:--:}OSrev.fs"; + filename "lif{:--:}OSrev.img"; hardware ethernet 08:00:09:70:c4:11; fixed-address 10.42.42.42; } diff --git a/distrib/notes/hppa/upgrade b/distrib/notes/hppa/upgrade index 9d3db28f1e2..44ed1cf6ce6 100644 --- a/distrib/notes/hppa/upgrade +++ b/distrib/notes/hppa/upgrade @@ -1,2 +1,2 @@ -dnl $OpenBSD: upgrade,v 1.9 2011/08/08 20:03:03 miod Exp $ -OpenBSDUpgrade({:-the LIF image ``lif{:--:}OSrev.fs'', or a RAMDISK kernel ``bsd.rd''-:}) +dnl $OpenBSD: upgrade,v 1.10 2020/05/17 17:04:28 deraadt Exp $ +OpenBSDUpgrade({:-the LIF image ``lif{:--:}OSrev.img'', or a RAMDISK kernel ``bsd.rd''-:}) diff --git a/distrib/notes/landisk/contents b/distrib/notes/landisk/contents index ff46516dc8d..1221ebb6bfa 100644 --- a/distrib/notes/landisk/contents +++ b/distrib/notes/landisk/contents @@ -1,8 +1,8 @@ -dnl $OpenBSD: contents,v 1.16 2017/09/25 10:47:46 jsg Exp $ +dnl $OpenBSD: contents,v 1.17 2020/05/17 17:04:28 deraadt Exp $ TopPart dnl can't use OpenBSDminiroot here - comment is inappropriate - miniroot{:--:}OSrev.fs A miniroot filesystem image to be copied to + miniroot{:--:}OSrev.img A miniroot filesystem image to be copied to the beginning of the disk to allow installing OpenBSD OSREV. diff --git a/distrib/notes/landisk/prep b/distrib/notes/landisk/prep index 7174f64f031..0b03c7117ef 100644 --- a/distrib/notes/landisk/prep +++ b/distrib/notes/landisk/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.5 2016/09/02 12:17:32 tb Exp $ +dnl $OpenBSD: prep,v 1.6 2020/05/17 17:04:28 deraadt Exp $ The default configuration of the MACHINE systems comes with a Linux installation on the disk (either an IDE hard drive, or a CompactFlash card). At the moment, there is no known way to log in this installation @@ -6,7 +6,7 @@ as ``root'' or interrupt the boot process, and start an OpenBSD installation procedure. Because of this, the only way to boot the OpenBSD install is to copy -the miniroot "miniroot{:--:}OSrev.fs" image to the hard drive or CompactFlash +the miniroot "miniroot{:--:}OSrev.img" image to the hard drive or CompactFlash (on the other hand, upgrades can be started by copying bsd.rd to the OpenBSD disk and booting from it). @@ -18,7 +18,7 @@ it uses. Under OpenBSD, it will appear as a ``wd'' device, for example Use the dd(1) utility to copy the miniroot to the hard drive. The command would likely be, under OpenBSD: - dd if=miniroot{:--:}OSrev.fs of=/dev/rwd1c + dd if=miniroot{:--:}OSrev.img of=/dev/rwd1c Replace ``rwd1c'' with the appropriate device name for the raw device on the system used to do the copy. diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install index dd66126c036..62bd3071f72 100644 --- a/distrib/notes/luna88k/install +++ b/distrib/notes/luna88k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.14 2015/03/27 20:55:56 miod Exp $ +dnl $OpenBSD: install,v 1.15 2020/05/17 17:04:28 deraadt Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -58,7 +58,7 @@ Booting from the miniroot: Copy the OpenBSD/MACHINE miniroot to the swap partition (assuming your disk is sd0): - dd if=miniroot{:--:}OSrev.fs of=/dev/sd0b + dd if=miniroot{:--:}OSrev.img of=/dev/sd0b After halting the system, at the PROM prompt, enter diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common index 11b6c638be2..68f66ba4c89 100644 --- a/distrib/notes/m4.common +++ b/distrib/notes/m4.common @@ -1,5 +1,5 @@ dnl -dnl $OpenBSD: m4.common,v 1.128 2019/08/01 19:42:51 jmc Exp $ +dnl $OpenBSD: m4.common,v 1.129 2020/05/17 17:04:27 deraadt Exp $ dnl dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org> dnl @@ -173,7 +173,7 @@ dnl dnl Floppy and bootable cdrom stuff dnl define({:-OpenBSDfloppy-:}, -{:- floppy{:--:}OSrev.fs The standard MACHINE boot and installation floppy; +{:- floppy{:--:}OSrev.img The standard MACHINE boot and installation floppy; see below.-:})dnl dnl define({:-OpenBSDinstalliso-:}, @@ -221,12 +221,12 @@ define({:-OpenBSDrd-:}, system.-:})dnl dnl define({:-OpenBSDminiroot-:}, -{:- miniroot{:--:}OSrev.fs A miniroot filesystem image to be used if you +{:- miniroot{:--:}OSrev.img A miniroot filesystem image to be used if you 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 +{:- install{:--:}OSrev.img 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 @@ -913,7 +913,7 @@ define({:-OpenBSDXferFloppyFromUNIX-:}, Next, use the dd(1) utility to copy the file to the floppy drive. The command would likely be, under OpenBSD: - dd if=floppy{:--:}OSrev.fs of=/dev/rfd0c bs=36b + dd if=floppy{:--:}OSrev.img of=/dev/rfd0c bs=36b If you are using another operating system, you may have to adapt this to conform to local naming conventions for the floppy and @@ -941,13 +941,13 @@ define({:-OpenBSDXferUSBFromUNIX-:}, 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. + image miniroot{:--:}OSrev.img or install{:--:}OSrev.img 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 + dd if=miniroot{:--:}OSrev.img 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. diff --git a/distrib/notes/octeon/prep b/distrib/notes/octeon/prep index d28e41964d2..ac5a0b85a79 100644 --- a/distrib/notes/octeon/prep +++ b/distrib/notes/octeon/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.9 2018/12/21 14:35:56 visa Exp $ +dnl $OpenBSD: prep,v 1.10 2020/05/17 17:04:28 deraadt Exp $ By default MACHINE systems are shipped with a Linux (or proprietary) system installed on the CompactFlash card or USB drive. @@ -24,7 +24,7 @@ Booting from a CF card or USB: Use the dd(1) utility to copy the miniroot to the hard drive. The command would likely be, under OpenBSD: - dd if=miniroot{:--:}OSrev.fs of=/dev/rsd1c + dd if=miniroot{:--:}OSrev.img of=/dev/rsd1c On the EdgeRouter Lite, some USB storage devices are not detected immediately after power on: diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents index 4789c16b623..6b5be061346 100644 --- a/distrib/notes/sparc64/contents +++ b/distrib/notes/sparc64/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.54 2017/09/25 10:47:46 jsg Exp $ +dnl $OpenBSD: contents,v 1.55 2020/05/17 17:04:28 deraadt Exp $ TopPart OpenBSDminiroot @@ -12,7 +12,7 @@ OpenBSDfloppy - Ultra 1/1E - Ultra 2 - floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy; + floppyB{:--:}OSrev.img Another MACHINE boot and installation floppy; see below. This floppy image will boot on some PCI-based MACHINE models, such as: diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install index 1d8ff5a6a6f..9beae67d416 100644 --- a/distrib/notes/sparc64/install +++ b/distrib/notes/sparc64/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.51 2017/03/04 22:46:20 tj Exp $ +dnl $OpenBSD: install,v 1.52 2020/05/17 17:04:28 deraadt Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -170,7 +170,7 @@ handle corresponding to the root filesystem. If successful, the boot program starts reading from the remote root filesystem in search of the kernel which is then read into memory. -You will want export the miniroot{:--:}OSrev.fs filesystem to the client. You +You will want export the miniroot{:--:}OSrev.img filesystem to the client. You can dd this filesystem image to some spare partition, mount and export that partition, or use tar to copy the contents to a more convenient spot. diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer index b95f9780d85..bf58743b101 100644 --- a/distrib/notes/sparc64/xfer +++ b/distrib/notes/sparc64/xfer @@ -1,4 +1,4 @@ -dnl $OpenBSD: xfer,v 1.34 2019/08/01 19:42:52 jmc Exp $ +dnl $OpenBSD: xfer,v 1.35 2020/05/17 17:04:28 deraadt Exp $ Installation is supported from several media types, including: CD-ROM (NOT supported if booting from floppy) @@ -29,7 +29,7 @@ OpenBSDXferFloppyFromUNIX Creating a bootable hard disk using SunOS, Solaris or other Unix-like system: If you don't have a floppy drive you can copy the miniroot - "miniroot{:--:}OSrev.fs" onto the hard disk you intend to boot on. + "miniroot{:--:}OSrev.img" onto the hard disk you intend to boot on. Traditionally, the way to do this is to use dd(1) to place the bootable filesystem image in the "swap" partition of the disk (while running in single user mode), and then booting from that @@ -45,9 +45,9 @@ Creating a bootable hard disk using SunOS, Solaris or other Unix-like system: Use the dd(1) utility to copy the file to the hard drive. The command would likely be, under SunOS: - dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=64b + dd if=miniroot{:--:}OSrev.img of=/dev/rsd0b bs=64b and under Solaris: - dd if=miniroot{:--:}OSrev.fs of=/dev/rdsk/c0t0d0s1 bs=64b + dd if=miniroot{:--:}OSrev.img of=/dev/rdsk/c0t0d0s1 bs=64b The blocksize is arbitrary as long as it's a multiple of 512-bytes and within the maximum supported by the driver, i.e. bs=126b may diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index d30b3d21a75..f8bc4bc9734 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.16 2019/05/03 20:03:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.17 2020/05/17 17:04:28 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 24576 FSDISKTYPE= miniroot MOUNT_POINT= /mnt diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index 4db7807e612..bf9ab326365 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.28 2019/05/03 23:53:05 deraadt Exp $ +# $OpenBSD: Makefile,v 1.29 2020/05/17 17:04:28 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img CDROM= cd${OSrev}.iso # must match the size of `minicdroot' in disktab CDFSMB= 15 diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index e8969f42587..131ecf26707 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2019/04/30 21:15:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.22 2020/05/17 17:04:28 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} @@ -43,7 +43,7 @@ ${CDROM}: ${BASE} ${XBASE} disklabel -w `cat vnd` fakecdrom "OpenBSD${OSrev}${MACHINE}" vnconfig -u `cat vnd` rm -f vnd - mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${OSrev}.fs + mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${OSrev}.img unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile index 1d4fa241237..f558ecd3596 100644 --- a/distrib/sparc64/miniroot/Makefile +++ b/distrib/sparc64/miniroot/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.21 2020/04/04 13:28:46 deraadt Exp $ +# $OpenBSD: Makefile,v 1.22 2020/05/17 17:04:28 deraadt Exp $ -FS= miniroot${OSrev}.fs +FS= miniroot${OSrev}.img FSSIZE= 6400 FSDISKTYPE= fakeramdisk CDROM= cd${OSrev}.iso diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index a0c85834af4..8c298e1f6b2 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.49 2019/05/03 20:03:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.50 2020/05/17 17:04:28 deraadt Exp $ -FS= floppy${OSrev}.fs +FS= floppy${OSrev}.img FSSIZE= 2880 FSDISKTYPE= floppy MOUNT_POINT= /mnt diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index d502a5e1869..289cc1a0208 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.44 2019/05/03 20:03:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.45 2020/05/17 17:04:28 deraadt Exp $ -FS= floppyB${OSrev}.fs +FS= floppyB${OSrev}.img FSSIZE= 2880 FSDISKTYPE= floppy MOUNT_POINT= /mnt |