diff options
| author | jkh <jkh@FreeBSD.org> | 1998-12-06 04:06:39 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-12-06 04:06:39 +0000 |
| commit | 3b716d369cea7cb4fdd59b9e5465fd447fdb5d4e (patch) | |
| tree | 3b0c3d272fb9103f952fe70ff7bb5d36182582aa /release | |
| parent | e2a1b1bb3b772de7b9a89bd485deb2f7ba241aaf (diff) | |
| download | FreeBSD-src-3b716d369cea7cb4fdd59b9e5465fd447fdb5d4e.zip FreeBSD-src-3b716d369cea7cb4fdd59b9e5465fd447fdb5d4e.tar.gz | |
Put mfsroot.gz on yet another filesystem so that the boot blocks
can really read it. Hmm. I have no idea *how* this worked in our
earlier tests on the x86. :)
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 16 | ||||
| -rw-r--r-- | release/scripts/doFS.sh | 6 |
2 files changed, 15 insertions, 7 deletions
diff --git a/release/Makefile b/release/Makefile index 899abf7..c67e0be 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.431 1998/11/24 00:17:50 jkh Exp $ +# $Id: Makefile,v 1.432 1998/12/06 00:05:42 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -471,12 +471,16 @@ release.8: write_mfs_in_kernel dumpnlist @gzip -9 ${RD}/mfsfd/stand/help/*.hlp sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${BOOTMFSSIZE} \ ${RD}/mfsfd ${MFSINODE} ${BOOTMFSLABEL} - mv fs-image fs-image.std - mv fs-image.size fs-image.std.size - gzip -c fs-image.std > ${RD}/floppies/mfsroot.gz - cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std + @cp fs-image fs-image.std + @mv fs-image.size fs-image.std.size + @gzip fs-image + @sh -e ${.CURDIR}/scripts/doFS.sh ${RD} ${MNT} ${BOOTSIZE} \ + fs-image.gz ${BOOTINODE} ${BOOTLABEL} + mv fs-image ${RD}/floppies/mfsroot.flp + @rm -f fs-image.gz fs-image.size + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std mv ${RD}/floppies/bootstd.flp ${RD}/floppies/kern.flp - cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std _MFSKERN=YES + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=std _MFSKERN=YES mv ${RD}/floppies/bootstd.flp ${RD}/floppies/boot.flp @echo "Regular and MFS boot floppies made." touch release.8 diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index 74bab09..50d1c84 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -49,7 +49,11 @@ do mount /dev/${VNDEVICE}c ${MNT} - ( set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT} ) + if [ -d ${FSPROTO} ]; then + (set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT}) + else + cp -p ${FSPROTO} ${MNT} + fi df -ki /mnt |
