summaryrefslogtreecommitdiff
path: root/regress/usr.sbin/installboot
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-10-10 11:06:15 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-10-10 11:06:15 +0000
commit99139d51c5dbab938eec024a589b046b91a23c9a (patch)
tree36bacac878919da8bfc43109fefbb94b2f234fe0 /regress/usr.sbin/installboot
parent7d05f72292828a3711a22ff7ccc6a53f21f6211f (diff)
Continue tests is the mountpoint already exists
regress should be resilient against partially cleaned obj/. Feedback bluhm
Diffstat (limited to 'regress/usr.sbin/installboot')
-rw-r--r--regress/usr.sbin/installboot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/usr.sbin/installboot/Makefile b/regress/usr.sbin/installboot/Makefile
index 8d91ccbd46b..0526146baff 100644
--- a/regress/usr.sbin/installboot/Makefile
+++ b/regress/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2022/09/17 09:30:18 kn Exp $
+# $OpenBSD: Makefile,v 1.34 2022/10/10 11:06:14 kn Exp $
INSTALLBOOT ?= /usr/sbin/installboot
DRY_RUN = ${INSTALLBOOT} -n
@@ -89,7 +89,7 @@ create-root: create-disks
.endif
${SUDO} disklabel -Aw -- "$$(<${ROOTDEVFILE})"
${SUDO} newfs -q -- "$$(<${ROOTDEVFILE})"a 1>/dev/null
- mkdir -- ${MOUNTPOINT}
+ mkdir -p -- ${MOUNTPOINT}
${SUDO} mount -- /dev/"$$(<${ROOTDEVFILE})"a ${MOUNTPOINT}
${SUDO} mkdir -- ${MOUNTPOINT}/usr
${SUDO} cp -r -- ${STAGEDIR} ${MOUNTPOINT}/usr/