summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2019-04-28 15:23:50 +0000
committerderaadt <deraadt@openbsd.org>2019-04-28 15:23:50 +0000
commit88f5a0010418b4e21562f18ca01c3ba2ac17870f (patch)
treeabfdd36d3b153463d3c4337869327ac7f355a9ff
parentCBIN variable is also pointless, it is always "instbin". Rather than (diff)
downloadwireguard-openbsd-88f5a0010418b4e21562f18ca01c3ba2ac17870f.tar.xz
wireguard-openbsd-88f5a0010418b4e21562f18ca01c3ba2ac17870f.zip
NEWFS_WILL_FAIL is a ridiculous unused artifact.
-rw-r--r--distrib/ramdisk/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 194776b536b..1dbaec1ad37 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2019/04/28 15:21:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.57 2019/04/28 15:23:50 deraadt Exp $
REV= ${OSrev}
@@ -14,7 +14,6 @@ MOUNT_POINT?= /mnt
DISKTYPE= rdroot
IMAGE?= ramdisk${REV}.fs
IMAGESIZE?= 8192 # 4MB in 512 byte blocks
-NEWFS_WILL_FAIL?=false
CRUNCHGENOPTS?=-E
UTILS?= ${.CURDIR}/../miniroot
@@ -79,7 +78,7 @@ ${IMAGE}: instbin
dd if=/dev/zero of=${IMAGE} count=${IMAGESIZE}
vnconfig -v ${IMAGE} > vnd
disklabel -w $(cat vnd) ${DISKTYPE}
- newfs ${NEWFSOPTS_RD} /dev/r$(cat vnd)a || ${NEWFS_WILL_FAIL}
+ newfs ${NEWFSOPTS_RD} /dev/r$(cat vnd)a
mount /dev/$(cat vnd)a ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \