From e6e736d9bea7dad719b3d096ab50ba9005e956ac Mon Sep 17 00:00:00 2001 From: krw Date: Mon, 24 Apr 2023 17:07:33 +0000 Subject: [PATCH] Replace the only two uses of disklabel template files with 'echo "/ *"'. No functional change. ok kn@ --- distrib/amd64/iso/Makefile | 4 ++-- distrib/amd64/ramdisk_cd/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 5a04b8ec205..42dd33dcfaa 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2023/03/10 20:16:53 krw Exp $ +# $OpenBSD: Makefile,v 1.46 2023/04/24 17:07:33 krw Exp $ FS= install${OSrev}.img FSSIZE= 1359872 @@ -27,7 +27,7 @@ ${FS}: ${BASE} ${XBASE} bsd.rd dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE} vnconfig -v ${FS} > vnd fdisk -yi -l ${FSSIZE} -b ${MSDOSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd` - disklabel -wAT ${.CURDIR}/template `cat vnd` + echo '/ *' | disklabel -wAT- `cat vnd` newfs -t msdos /dev/r`cat vnd`i mount /dev/`cat vnd`i ${MOUNT_POINT} mkdir -p ${MOUNT_POINT}/efi/boot diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index 42c33d5e00f..f4ef4f13212 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2023/03/10 20:16:53 krw Exp $ +# $OpenBSD: Makefile,v 1.37 2023/04/24 17:07:34 krw Exp $ FS= miniroot${OSrev}.img FSSIZE= 11392 @@ -20,7 +20,7 @@ ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} vnconfig -v ${FS} > vnd fdisk -yi -l ${FSSIZE} -b 960 -f ${DESTDIR}/usr/mdec/mbr `cat vnd` - disklabel -wAT ${.CURDIR}/template `cat vnd` + echo '/ *' | disklabel -wAT- `cat vnd` newfs -t msdos /dev/r`cat vnd`i mount ${MOUNT_ARGS_msdos} /dev/`cat vnd`i ${MOUNT_POINT} mkdir -p ${MOUNT_POINT}/efi/boot -- 2.20.1