summaryrefslogtreecommitdiff
path: root/distrib/miniroot
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-05-03 22:20:58 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-05-03 22:20:58 +0000
commitcb7c540477782dbe9545b52977d13b73d00af545 (patch)
tree52e87dd289daf7a7eed8132ab4ef8be2f7dbeed9 /distrib/miniroot
parentf0e4c642b3ddb847f61bdd361d74f549232dc068 (diff)
Allow certain ports to tell that newfs might fail
Diffstat (limited to 'distrib/miniroot')
-rw-r--r--distrib/miniroot/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile
index 8bafd5535f4..5d741952c52 100644
--- a/distrib/miniroot/Makefile
+++ b/distrib/miniroot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 1997/05/02 08:45:41 niklas Exp $
+# $OpenBSD: Makefile,v 1.11 1997/05/03 22:20:57 niklas Exp $
# $NetBSD: Makefile,v 1.2.4.3 1996/07/04 07:05:32 leo Exp $
# Revision is 2.1
@@ -21,6 +21,7 @@ REALIMAGE!= echo /tmp/image.${PID}
IMAGE?= miniroot${REV}.fs
IMAGESIZE?= 10240 # 5Mb in 512 byte blocks
NEWFSOPTS?=
+NEWFS_WILL_FAIL?=false
LISTS= ${.CURDIR}/list ${ARCHDIR}/list
CRUNCHCONF= ${CBIN}.conf
@@ -42,7 +43,8 @@ all: ${CBIN} bsd
dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
vnconfig -v -c ${VND} ${REALIMAGE}
disklabel -w -r ${VND} ${DISKTYPE}
- newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE}
+ newfs -m 0 -o space ${NEWFSOPTS} ${VND_RDEV} ${DISKTYPE} || \
+ ${NEWFS_WILL_FAIL}
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} ARCHDIR=${ARCHDIR} \