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/sparc64 | |
| 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/sparc64')
| -rw-r--r-- | distrib/sparc64/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sparc64/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
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 |