summaryrefslogtreecommitdiff
path: root/distrib/simpleroot
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-05-03 16:50:57 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-05-03 16:50:57 +0000
commit86937f023eb5162b9c70b785321c250fd4dad6c6 (patch)
treef793a1664c61d60544705779e7b85fc858554c02 /distrib/simpleroot
parent526b4de1293d7ecb5ff304991bbfaebe13853e54 (diff)
Introduce IMAGEDIR to control where the image gets built.
Fix argument to vnconfig -u.
Diffstat (limited to 'distrib/simpleroot')
-rw-r--r--distrib/simpleroot/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/distrib/simpleroot/Makefile b/distrib/simpleroot/Makefile
index 6eb6cf96fc7..9422be04790 100644
--- a/distrib/simpleroot/Makefile
+++ b/distrib/simpleroot/Makefile
@@ -13,8 +13,9 @@ VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
DISKTYPE= simpleroot
PID!= echo $$$$
-REALIMAGE!= echo /var/tmp/image.${PID}
-IMAGE?= /var/tmp/simpleroot${REV}.fs
+IMAGEDIR?= /var/tmp
+REALIMAGE!= echo ${IMAGEDIR}/image.${PID}
+IMAGE?= ${IMAGEDIR}/simpleroot${REV}.fs
NEWFSOPTS?=
LIST= ${ARCHDIR}/list
@@ -41,12 +42,12 @@ all:
tar xpf - ) && \
( cd ${MOUNT_POINT} && \
tar cf - .??* * | ${GZIP} ${GZIPFLAGS} \
- > /var/tmp/simpleroot${REV}.tar${GZIPEXT} )
+ > ${IMAGEDIR}/simpleroot${REV}.tar${GZIPEXT} )
@echo ""
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
- vnconfig -u ${VND_DEV}
+ vnconfig -u ${VND}
cat /*bin/* > /dev/null
cp ${REALIMAGE} ${IMAGE}
.if (${GZIP} == "gzip")