vnconfig has changed to mdconfig in -current, but the
picobsd build script still references vnconfig, also
CONFIG isn't defined anywhere in the script, resulting
in the process dying when it tries to configure the
kernel, a couple of punctuation mods here and there,
and dumped the "vnode is..." log.
Index: picobsd
===================================================================
RCS file: /home/ncvs/src/release/picobsd/build/picobsd,v
retrieving revision 1.7
diff -r1.7 picobsd
3c3
< # $FreeBSD: src/release/picobsd/build/picobsd,v 1.7 2001/06/21 08:49:46 luigi Exp $
---
> # $FreeBSD$
80,85d79
< NO_DEVFS=yes # DEVFS is currently broken. Always set this.
<
< # Find a suitable vnode
< VNUM=`mount | awk "/vn/ { num++ } END { printf \"%d\", num }"`
< log "---> Using vn${VNUM}..."
<
161d154
< echo "-> vnode is $VNUM"
329c322
< dd if=${BUILDDIR}/picobsd.bin of=/dev/rfd0.${FLOPPY_SIZE}
---
> dd if=${BUILDDIR}/picobsd.bin of=/dev/fd0
427c420
< gzip -9 etc/*
---
> for f in `find etc/ -type 'f'` ; do gzip -9 $f ; done
436,437d428
< free_vnode
<
448c439
< disklabel -rw vn${VNUM} fd${MFS_SIZE} || fail $? mfs_disklabel
---
> disklabel -rw md${VNUM} fd${MFS_SIZE} || fail $? mfs_disklabel
450c441
< disklabel -rw vn${VNUM} auto || fail $? mfs_disklabel
---
> disklabel -rw md${VNUM} auto || fail $? mfs_disklabel
452,454c443,445
< newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c > /dev/null
< mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT} || fail $? no_mount
< log "`df /dev/vn${VNUM}c`"
---
> newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/md${VNUM}c > /dev/null
> mount /dev/md${VNUM}c ${MFS_MOUNTPOINT} || fail $? no_mount
> log "`df /dev/md${VNUM}c`"
528c519
< cp -Rp ${BUILDDIR}/floppy.tree/* ${MFS_MOUNTPOINT}/fd
---
> cp -Rp ${BUILDDIR}/floppy.tree/* ${MFS_MOUNTPOINT}/fd || fail $? ftree_copy
533,534c524,525
< fsck -p /dev/rvn${VNUM}c
< vnconfig -u vn${VNUM}
---
> fsck -p /dev/md${VNUM}c
> vnconfig -u md${VNUM}
540,541c531,532
< umount /dev/vn${VNUM} 2> /dev/null || true
< vnconfig -u vn${VNUM} 2> /dev/null || true
---
> umount /dev/md${VNUM} 2> /dev/null || true
> mdconfig -d -u ${VNUM} 2> /dev/null || true
557,559c548,550
< no_vnconfig)
< echo "Error while doing vnconfig of ${imgname} on /dev/rvn${VNUM}..."
< echo " Most probably your running kernel doesn't have the vn(4) device."
---
> no_mdconfig)
> echo "Error while doing mdconfig of ${imgname} on /dev/md${VNUM}..."
> echo " Most probably your running kernel doesn't have the md(4) device."
562c553
< echo "Error while labeling ${MFS_NAME} size ${MFS_SIZE}"
---
> echo "Error while labeling ${MFS_NAME} size ${MFS_SIZE}."
565c556
< echo "Error while mounting ${MFS_NAME} (/dev/vn${VNUM}c) on ${MFS_MOUNTPOINT}"
---
> echo "Error while mounting ${MFS_NAME} (/dev/md${VNUM}c) on ${MFS_MOUNTPOINT}."
568c559
< echo "Error while making hierarchy in ${MFS_MOUNTPOINT}"
---
> echo "Error while making hierarchy in ${MFS_MOUNTPOINT}."
574c565
< echo "Error while doing disklabel on of floppy.img size $FLOPPY_SIZE"
---
> echo "Error while doing disklabel on of floppy.img size $FLOPPY_SIZE."
577c568,576
< echo "Error: you must build PICOBSD${suffix} kernel first"
---
> echo "Error: you must build PICOBSD${suffix} kernel first."
> ;;
> ftree_copy)
> echo "Error while copying floppy tree to ${MFS_MOUNTPOINT}."
> echo " Perhaps ${MFS_MOUNTPOINT} is out of space."
> ;;
> kernel_copy)
> echo "Error while copying PICOBSD${suffix}/kernel to ${MFS_MOUNTPOINT}."
> echo " Perhaps ${MFS_MOUNTPOINT} is out of space."
594c593
< # Create a zero-filled disk image with a boot sector, and vnconfig it.
---
> # Create a zero-filled disk image with a boot sector, and mdconfig it.
602c601,602
< vnconfig -c -s labels vn${VNUM} ${imgname} || fail $? no_vnconfig
---
> VNODE=`mdconfig -a -t vnode -s ${imgsize}k -f ${imgname}` || fail $? no_mdconfig
> VNUM=`echo ${VNODE} | sed 's/^md//'`
622c622
< disklabel -Brw -b ${boot1} -s ${b2} vn${VNUM} fd${FLOPPY_SIZE} || \
---
> disklabel -Brw -b ${boot1} -s ${b2} md${VNUM} fd${FLOPPY_SIZE} || \
625c625
< newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/vn${VNUM}c > /dev/null
---
> newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/md${VNUM}c > /dev/null
627c627
< mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT}
---
> mount /dev/md${VNUM}c ${MFS_MOUNTPOINT}
636c636,639
< cp -p kernel.gz ${MFS_MOUNTPOINT}/kernel
---
>
> du -k kernel.gz
> df -k ${MFS_MOUNTPOINT}
> cp -p kernel.gz ${MFS_MOUNTPOINT}/kernel || fail $? kernel_copy
714a718,723
>
> # Ugh.
> if [ ! $CONFIG ]; then
> CONFIG=config
> fi
>
717,719c726,730
< THETYPE=$1
< SITE=$2
< set_type $THETYPE
---
> # First, check if arguments where passed to us before parsing.
> if [ "$2" ]; then
> THETYPE=$1
> SITE=$2
> set_type $THETYPE
721c732
< # If $1="package", it creates a neat set of floppies
---
> # If $1="package", it creates a neat set of floppies
723,724c734,736
< if [ "$1" = "package" ] ; then
< build_package
---
> if [ "$1" = "package" ] ; then
> build_package
> fi
725a738
>
734a748,749
>
> # Do final cleanup
--
Omachonu Ogali
[EMAIL PROTECTED]
http://www.informationwave.net
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
