aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hay <jhay@FreeBSD.org>1998-03-22 18:39:42 +0000
committerJohn Hay <jhay@FreeBSD.org>1998-03-22 18:39:42 +0000
commit4f0591349b24ccb53fea3d74d57cf419ce3e1010 (patch)
tree51574c6686b85fdc11b60e96d78fef5d083c79c7
parenta76f172954aaf436c0543cd3d4b2462eb27f6a42 (diff)
downloadsrc-4f0591349b24ccb53fea3d74d57cf419ce3e1010.tar.gz
src-4f0591349b24ccb53fea3d74d57cf419ce3e1010.zip
Make the vn device that is being used to build the floppies configurable.
You can now do something like "make release VNDEVICE=vn1". This makes it possible to do something else with vn0, for instance building another release.
Notes
Notes: svn path=/head/; revision=34782
-rw-r--r--release/Makefile11
-rw-r--r--release/doFS.sh4
-rw-r--r--release/scripts/doFS.sh4
3 files changed, 13 insertions, 6 deletions
diff --git a/release/Makefile b/release/Makefile
index 5e46c43e38b1..5057583faccc 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.344 1998/03/06 23:03:49 jkh Exp $
+# $Id: Makefile,v 1.345 1998/03/10 17:29:44 jkh Exp $
#
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
#
@@ -64,6 +64,8 @@ MFSINODE= 7000
FIXITINODE= 2000
BOOTINODE= 100000
+VNDEVICE?= vn0
+
# Things which may get you into trouble if you change them
MTREEFILES= ${.CURDIR}/../etc/mtree
RD= /R/stage
@@ -177,6 +179,7 @@ rerelease release:
echo "export CFLAGS='-O2 -pipe'" >> ${CHROOTDIR}/mk
echo "export DISTRIBUTIONS=\"${DISTRIBUTIONS}\"" >> ${CHROOTDIR}/mk
echo "export BUILDNAME=${BUILDNAME}" >> ${CHROOTDIR}/mk
+ echo "export VNDEVICE=${VNDEVICE}" >> ${CHROOTDIR}/mk
.if defined(RELEASETAG)
echo "export RELEASETAG=${RELEASETAG}" >> ${CHROOTDIR}/mk
.endif
@@ -650,12 +653,12 @@ doMFSKERN:
.if defined(BOOT_CONFIG)
@echo "${BOOT_CONFIG}" >${RD}/boot.${FSIMAGE}/boot.config
.endif
- @vnconfig /dev/vn0 fs-image.${FSIMAGE}
+ @vnconfig /dev/${VNDEVICE} fs-image.${FSIMAGE}
@mkdir -p /tmp/mnt_xx
- @mount /dev/vn0 /tmp/mnt_xx
+ @mount /dev/${VNDEVICE} /tmp/mnt_xx
./dumpnlist ${RD}/boot.${FSIMAGE}/kernel > /tmp/mnt_xx/stand/symbols
@umount /tmp/mnt_xx
- @vnconfig -u /dev/vn0
+ @vnconfig -u /dev/${VNDEVICE}
@rmdir /tmp/mnt_xx
./write_mfs_in_kernel ${RD}/boot.${FSIMAGE}/kernel \
fs-image.${FSIMAGE}
diff --git a/release/doFS.sh b/release/doFS.sh
index 61195fd2e400..43b93eb3aae6 100644
--- a/release/doFS.sh
+++ b/release/doFS.sh
@@ -1,7 +1,9 @@
:
#set -ex
-VNDEVICE=vn0
+if [ "x$VNDEVICE" = "x" ] ; then
+ VNDEVICE=vn0
+fi
export BLOCKSIZE=512
RD=$1 ; shift
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh
index 61195fd2e400..43b93eb3aae6 100644
--- a/release/scripts/doFS.sh
+++ b/release/scripts/doFS.sh
@@ -1,7 +1,9 @@
:
#set -ex
-VNDEVICE=vn0
+if [ "x$VNDEVICE" = "x" ] ; then
+ VNDEVICE=vn0
+fi
export BLOCKSIZE=512
RD=$1 ; shift