Attachment #9334 for bug #19156

View | Details | Raw Unified | Return to bug 19156
Collapse All | Expand All




		tar xf - -C ${RD}/mfsfd/stand
	@echo "Compressing doc files..."
	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} /dev \
		${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
	@gzip -9vc mfsroot > mfsroot.gz
	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
		${RD} ${MNT} /dev ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot BIGBOOT=YES
	@rm mfsroot mfsroot.gz mfsroot.size

	@cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar
	@chmod 555 ${RD}/fixitfd/stand/tar
	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
		${MNT} /dev ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
# Do our last minute floppies directory setup in a convenient place.
	@cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT
	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)

	@rm -f ${RD}/floppies/${FSIMAGE}.flp
.if defined(BIGBOOT)
	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
		${RD} ${MNT} /dev ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
		${BOOTINODE} ${BIGBOOTLABEL}
.else
	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
		${RD} ${MNT} /dev ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
		${BOOTINODE} ${BOOTLABEL}
.endif
	@echo "Created ${RD}/floppies/${FSIMAGE}.flp"




FSIMG=$1; shift
RD=$1 ; shift
MNT=$1 ; shift
DEV=$1 ; shift
FSSIZE=$1 ; shift
FSPROTO=$1 ; shift
FSINODE=$1 ; shift
FSLABEL=$1 ; shift

deadlock=20
created_mnt=0
created_dev=0

[ -d ${MNT} ] ||
{
	mkdir -p ${MNT} || { echo "unable to create ${MNT} directory"; exit 1; }
	created_mnt=1
}
CUR=`pwd`
cd ${MNT}
MNT=`pwd`
cd ${CUR}

[ -d ${DEV} ] ||
{
	mkdir -p ${DEV} || { echo "unable to create ${DEV} directory"; exit 1; }
	created_dev=1
}
cd ${DEV}
DEV=`pwd`
cd ${CUR}

u=`expr $VNDEVICE : 'vn\([0-9]*\)' || true`
rm -f ${DEV}/*vnn*
mknod ${DEV}/vnn${u} b 15 `expr 65538 + $u '*' 8`
mknod ${DEV}/rvnn${u} c 43 `expr 65538 + $u '*' 8`
mknod ${DEV}/vnn${u}c b 15 `expr 2 + $u '*' 8`
mknod ${DEV}/rvnn${u}c c 43 `expr 2 + $u '*' 8`
VNDEVICE=vnn$u

while true 
do
	rm -f ${FSIMG}

	umount ${DEV}/${VNDEVICE} 2>/dev/null || true

	umount ${MNT} 2>/dev/null || true

	vnconfig -u ${DEV}/r${VNDEVICE} 2>/dev/null || true

	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null
	# this suppresses the `invalid primary partition table: no magic'
	awk 'BEGIN {printf "%c%c", 85, 170}' |\
	    dd of=${FSIMG} obs=1 seek=510 conv=notrunc 2>/dev/null

	vnconfig -s labels -c ${DEV}/r${VNDEVICE} ${FSIMG}
	disklabel -Brw ${DEV}/r${VNDEVICE} ${FSLABEL}
	newfs -i ${FSINODE} -T ${FSLABEL} -o space ${DEV}/r${VNDEVICE}c

	mount ${DEV}/${VNDEVICE}c ${MNT}

	if [ -d ${FSPROTO} ]; then
		(set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT})

	set `df -ki ${MNT} | tail -1`

	umount ${MNT}
	vnconfig -u ${DEV}/r${VNDEVICE} 2>/dev/null || true

	echo ">>> Filesystem is ${FSSIZE} K, $4 left"
	echo ">>>     ${FSINODE} bytes/inode, $7 left"

	fi
	break;
done
rm -f ${DEV}/*vnn*

[ ${created_mnt} -eq 0 ] || { rmdir ${MNT}; }
[ ${created_dev} -eq 0 ] || { rmdir ${DEV}; }


Return to bug 19156

Lines 15-55 Link Here

(-)scripts/doFS.sh (-13 / +39 lines)
15	FSIMG=$1; shift	15	FSIMG=$1; shift
16	RD=$1 ; shift	16	RD=$1 ; shift
17	MNT=$1 ; shift	17	MNT=$1 ; shift
		18	DEV=$1 ; shift
18	FSSIZE=$1 ; shift	19	FSSIZE=$1 ; shift
19	FSPROTO=$1 ; shift	20	FSPROTO=$1 ; shift
20	FSINODE=$1 ; shift	21	FSINODE=$1 ; shift
21	FSLABEL=$1 ; shift	22	FSLABEL=$1 ; shift
22		23
23	deadlock=20	24	deadlock=20
		25	created_mnt=0
		26	created_dev=0
		27
		28	[ -d ${MNT} ] \|\|
		29	{
		30	mkdir -p ${MNT} \|\| { echo "unable to create ${MNT} directory"; exit 1; }
		31	created_mnt=1
		32	}
		33	CUR=`pwd`
		34	cd ${MNT}
		35	MNT=`pwd`
		36	cd ${CUR}
		37
		38	[ -d ${DEV} ] \|\|
		39	{
		40	mkdir -p ${DEV} \|\| { echo "unable to create ${DEV} directory"; exit 1; }
		41	created_dev=1
		42	}
		43	cd ${DEV}
		44	DEV=`pwd`
		45	cd ${CUR}
24		46
25	u=`expr $VNDEVICE : 'vn\([0-9]*\)' \|\| true`	47	u=`expr $VNDEVICE : 'vn\([0-9]*\)' \|\| true`
26	rm -f /dev/vnn	48	rm -f ${DEV}/vnn
27	mknod /dev/vnn${u} b 15 `expr 65538 + $u '*' 8`	49	mknod ${DEV}/vnn${u} b 15 `expr 65538 + $u '*' 8`
28	mknod /dev/rvnn${u} c 43 `expr 65538 + $u '*' 8`	50	mknod ${DEV}/rvnn${u} c 43 `expr 65538 + $u '*' 8`
29	mknod /dev/vnn${u}c b 15 `expr 2 + $u '*' 8`	51	mknod ${DEV}/vnn${u}c b 15 `expr 2 + $u '*' 8`
30	mknod /dev/rvnn${u}c c 43 `expr 2 + $u '*' 8`	52	mknod ${DEV}/rvnn${u}c c 43 `expr 2 + $u '*' 8`
31	VNDEVICE=vnn$u	53	VNDEVICE=vnn$u
32		54
33	while true	55	while true
34	do	56	do
35	rm -f ${FSIMG}	57	rm -f ${FSIMG}
36		58
37	umount /dev/${VNDEVICE} 2>/dev/null \|\| true	59	umount ${DEV}/${VNDEVICE} 2>/dev/null \|\| true
38		60
39	umount ${MNT} 2>/dev/null \|\| true	61	umount ${MNT} 2>/dev/null \|\| true
40		62
41	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null \|\| true	63	vnconfig -u ${DEV}/r${VNDEVICE} 2>/dev/null \|\| true
42		64
43	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null	65	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null
44	# this suppresses the `invalid primary partition table: no magic'	66	# this suppresses the `invalid primary partition table: no magic'
45	awk 'BEGIN {printf "%c%c", 85, 170}' \|\	67	awk 'BEGIN {printf "%c%c", 85, 170}' \|\
46	dd of=${FSIMG} obs=1 seek=510 conv=notrunc 2>/dev/null	68	dd of=${FSIMG} obs=1 seek=510 conv=notrunc 2>/dev/null
47		69
48	vnconfig -s labels -c /dev/r${VNDEVICE} ${FSIMG}	70	vnconfig -s labels -c ${DEV}/r${VNDEVICE} ${FSIMG}
49	disklabel -Brw /dev/r${VNDEVICE} ${FSLABEL}	71	disklabel -Brw ${DEV}/r${VNDEVICE} ${FSLABEL}
50	newfs -i ${FSINODE} -T ${FSLABEL} -o space /dev/r${VNDEVICE}c	72	newfs -i ${FSINODE} -T ${FSLABEL} -o space ${DEV}/r${VNDEVICE}c
51		73
52	mount /dev/${VNDEVICE}c ${MNT}	74	mount ${DEV}/${VNDEVICE}c ${MNT}
53		75
54	if [ -d ${FSPROTO} ]; then	76	if [ -d ${FSPROTO} ]; then
55	(set -e && cd ${FSPROTO} && find . -print \| cpio -dump ${MNT})	77	(set -e && cd ${FSPROTO} && find . -print \| cpio -dump ${MNT})
Lines 62-68 Link Here
62	set `df -ki ${MNT} \| tail -1`	84	set `df -ki ${MNT} \| tail -1`
63		85
64	umount ${MNT}	86	umount ${MNT}
65	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null \|\| true	87	vnconfig -u ${DEV}/r${VNDEVICE} 2>/dev/null \|\| true
66		88
67	echo ">>> Filesystem is ${FSSIZE} K, $4 left"	89	echo ">>> Filesystem is ${FSSIZE} K, $4 left"
68	echo ">>> ${FSINODE} bytes/inode, $7 left"	90	echo ">>> ${FSINODE} bytes/inode, $7 left"
Lines 71-74 Link Here
71	fi	93	fi
72	break;	94	break;
73	done	95	done
74	rm -f /dev/vnn	96	rm -f ${DEV}/vnn
		97
		98	[ ${created_mnt} -eq 0 ] \|\| { rmdir ${MNT}; }
		99	[ ${created_dev} -eq 0 ] \|\| { rmdir ${DEV}; }
		100

Lines 510-520 Link Here

(-)Makefile (-5 / +5 lines)
510	tar xf - -C ${RD}/mfsfd/stand	510	tar xf - -C ${RD}/mfsfd/stand
511	@echo "Compressing doc files..."	511	@echo "Compressing doc files..."
512	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp	512	@gzip -9 ${RD}/mfsfd/stand/help/*.hlp
513	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} \	513	sh -e ${.CURDIR}/scripts/doFS.sh -s mfsroot ${RD} ${MNT} /dev \
514	${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}	514	${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL}
515	@gzip -9vc mfsroot > mfsroot.gz	515	@gzip -9vc mfsroot > mfsroot.gz
516	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \	516	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/mfsroot.flp \
517	${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}	517	${RD} ${MNT} /dev ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL}
518	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern	518	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern
519	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot BIGBOOT=YES	519	@cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot BIGBOOT=YES
520	@rm mfsroot mfsroot.gz mfsroot.size	520	@rm mfsroot mfsroot.gz mfsroot.size
Lines 546-552 Link Here
546	@cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar	546	@cp ${.CURDIR}/scripts/tar.sh ${RD}/fixitfd/stand/tar
547	@chmod 555 ${RD}/fixitfd/stand/tar	547	@chmod 555 ${RD}/fixitfd/stand/tar
548	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \	548	@sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/fixit.flp ${RD} \
549	${MNT} ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}	549	${MNT} /dev ${FIXITSIZE} ${RD}/fixitfd ${FIXITINODE} ${FIXITLABEL}
550	# Do our last minute floppies directory setup in a convenient place.	550	# Do our last minute floppies directory setup in a convenient place.
551	@cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT	551	@cp ${.CURDIR}/texts/FLOPPIES.TXT ${RD}/floppies/README.TXT
552	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)	552	@(cd ${RD}/floppies; md5 README.TXT *.flp > CHECKSUM.MD5)
Lines 777-787 Link Here
777	@rm -f ${RD}/floppies/${FSIMAGE}.flp	777	@rm -f ${RD}/floppies/${FSIMAGE}.flp
778	.if defined(BIGBOOT)	778	.if defined(BIGBOOT)
779	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \	779	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
780	${RD} ${MNT} ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \	780	${RD} ${MNT} /dev ${BIGBOOTSIZE} ${RD}/image.${FSIMAGE} \
781	${BOOTINODE} ${BIGBOOTLABEL}	781	${BOOTINODE} ${BIGBOOTLABEL}
782	.else	782	.else
783	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \	783	sh -e ${.CURDIR}/scripts/doFS.sh ${RD}/floppies/${FSIMAGE}.flp \
784	${RD} ${MNT} ${BOOTSIZE} ${RD}/image.${FSIMAGE} \	784	${RD} ${MNT} /dev ${BOOTSIZE} ${RD}/image.${FSIMAGE} \
785	${BOOTINODE} ${BOOTLABEL}	785	${BOOTINODE} ${BOOTLABEL}
786	.endif	786	.endif
787	@echo "Created ${RD}/floppies/${FSIMAGE}.flp"	787	@echo "Created ${RD}/floppies/${FSIMAGE}.flp"