From: krw <krw@openbsd.org>
Date: Wed, 26 Apr 2023 13:01:02 +0000 (+0000)
Subject: Nuke variable 'LBA'. Always set for ramdisk_cd, never set for
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0e2fb8927ce70792a91f37debd7535c5fa5e585e;p=openbsd

Nuke variable 'LBA'. Always set for ramdisk_cd, never set for
ramdisk, so just keep or remove the conditional sections.

ok kn@ miod@
---

diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile
index 90f682a64d9..ceb437a3df8 100644
--- a/distrib/i386/ramdisk/Makefile
+++ b/distrib/i386/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2021/07/26 12:47:45 kn Exp $
+#	$OpenBSD: Makefile,v 1.17 2023/04/26 13:01:02 krw Exp $
 
 FS=		floppy${OSrev}.img
 FSSIZE=		2880
@@ -15,9 +15,6 @@ all: ${FS}
 ${FS}: bsd.gz
 	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
 	vnconfig -v ${FS} > vnd
-.ifdef LBA
-	fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
-.endif
 	disklabel -w `cat vnd` ${FSDISKTYPE}
 	newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index d778c5822d7..d997c79ea5c 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 2022/03/26 14:26:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.28 2023/04/26 13:01:02 krw Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		8448
@@ -11,16 +11,12 @@ RAMDISK=	RAMDISK_CD
 LISTS=		${.CURDIR}/list
 UTILS=		${.CURDIR}/../../miniroot
 
-LBA=1
-
 all: ${FS} ${CDROM}
 
 ${FS}: bsd.gz
 	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
 	vnconfig -v ${FS} > vnd
-.ifdef LBA
 	fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
-.endif
 	disklabel -w `cat vnd` ${FSDISKTYPE}
 	newfs -O 1 -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a
 	mount /dev/`cat vnd`a ${MOUNT_POINT}