From 94fe43e28b0204d547437df21450b927f51bb426 Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 10 Oct 2022 11:06:14 +0000 Subject: [PATCH] Continue tests is the mountpoint already exists regress should be resilient against partially cleaned obj/. Feedback bluhm --- regress/usr.sbin/installboot/Makefile | 4 ++-- 1 file 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/ -- 2.20.1