Index: head/release/picobsd/build/stage1
===================================================================
--- head/release/picobsd/build/stage1	(revision 44612)
+++ head/release/picobsd/build/stage1	(revision 44613)
@@ -1,93 +1,93 @@
 #! /bin/sh -
 
 #
-#	$Id: stage1,v 1.6 1999/01/14 23:14:46 abial Exp $
+#	$Id: stage1,v 1.7 1999/01/19 23:02:05 abial Exp $
 #
 
 set -e
 
 if [ ! -f ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel ]; then
 	echo "-> ERROR: you must build PICOBSD${suffix}.${SIZE} first"
 	exit 1
 fi
 
 echo "-> Preparing kernel..."
 cp -p ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel kernel
 #if [ "${TYPE}" != "dial" ]
 #then
 #	echo "-> Preparing kvm database..."
 #	mv /var/db/kvm_kernel.db /var/db/old.db
 #	kvm_mkdb kernel
 #	cp /var/db/kvm_kernel.db kvm_kernel.db
 #	mv /var/db/old.db /var/db/kvm_kernel.db
 #fi
 
 echo "-> Preparing MFS filesystem..."
 umount /dev/vn0 2> /dev/null || true
 umount /mnt 2> /dev/null || true
 vnconfig -u /dev/rvn0 2> /dev/null || true
 
 dd of=fs.PICOBSD if=/dev/zero count=${SIZE} bs=1k 2> /dev/null
 
 awk 'BEGIN {printf "%c%c", 85, 170}' | \
                 dd of=fs.PICOBSD obs=1 seek=510 conv=notrunc  2> /dev/null
 
 vnconfig -s labels -c /dev/rvn0 fs.PICOBSD 2>/dev/null
 #vnconfig -c /dev/rvn0 fs.PICOBSD 2>/dev/null
 if [ "X$?" != "X0" ]
 then
 	echo "-> Error while doing vnconfig of fs.PICOBSD on /dev/rvn0..."
 	echo "   Most probably your running kernel doesn't have the vn(4) device."
 	echo "-> Aborting $0"
 	exit 10
 fi
 
-dd if=/usr/mdec/boot1 of=fs.PICOBSD conv=notrunc 2> /dev/null
+dd if=/boot/boot1 of=fs.PICOBSD conv=notrunc 2> /dev/null
 
 # This command does weird things on 2.2.x systems. In such case use normal
 # disktype here instead
 if [ "${TYPE}" != "router" ]
 then
 	disklabel -rw vn0 auto
 else
 	if [ ${SIZE} -lt 1024 ]
 	then
 		disklabel -rw /dev/rvn0 fd${SIZE}
 	else
 		disklabel -rw vn0 auto
 	fi
 fi
 if [ "X$?" != "X0" ]
 then
 	echo "-> Error while labeling fs.PICOBSD (vn0)..."
 	echo "-> Aborting $0"
 	exit 10
 fi
 
 # Default setting for other (custom) setups.
 INODES=4096
 # You can save some space on MFS if you don't want so many inodes...
 if [ "${TYPE}" = "dial" ]
 then
 	INODES=4096
 fi
 if [ "${TYPE}" = "router" ]
 then
 	INODES=3072
 fi
 if [ "${TYPE}" = "net" ]
 then
 	INODES=4096
 fi
 if [ "${TYPE}" = "isp" ]
 then
 	INODES=4096
 fi
 newfs -i $INODES -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
 mount /dev/vn0c /mnt
 if [ "X$?" != "X0" ]
 then
 	echo "-> Error while mounting fs.PICOBSD (/dev/vn0c) on /mnt..."
 	echo "-> Aborting $0"
 	exit 10
 fi
Index: head/release/picobsd/build/stage3
===================================================================
--- head/release/picobsd/build/stage3	(revision 44612)
+++ head/release/picobsd/build/stage3	(revision 44613)
@@ -1,110 +1,110 @@
 #! /bin/sh -
 
 #
-#	$Id: stage3,v 1.3 1998/09/26 17:27:18 abial Exp $
+#	$Id: stage3,v 1.4 1999/01/14 23:14:46 abial Exp $
 #
 set -e
 
 . ../Version
 
 if [ ! -f kernel.gz ]; then
 	echo "-> ERROR: you must build kernel.gz first"
 	exit 1
 fi
 
 echo "-> Preparing 1.44 floppy filesystem..."
 umount /dev/vn0 2> /dev/null || true
 umount /mnt 2> /dev/null || true
 vnconfig -u /dev/rvn0 2> /dev/null || true
 
 dd of=picobsd.bin if=/dev/zero count=1440 bs=1k 2> /dev/null
 
 awk 'BEGIN {printf "%c%c", 85, 170}' | \
                 dd of=picobsd.bin obs=1 seek=510 conv=notrunc  2> /dev/null
 
 #vnconfig -s labels -c /dev/rvn0 picobsd.bin 2>/dev/null
 vnconfig -c /dev/rvn0 picobsd.bin 2>/dev/null
 if [ "X$?" != "X0" ]
 then
 	echo "-> ERROR while doing vnconfig of picobsd.bin on /dev/rvn0..."
 	echo "-> Aborting $0"
 	exit 10
 fi
 
-dd if=/usr/mdec/boot1 of=picobsd.bin conv=notrunc 2> /dev/null
+dd if=/boot/boot1 of=picobsd.bin conv=notrunc 2> /dev/null
 
-disklabel -Brw -b /usr/mdec/fdboot -s /usr/mdec/bootfd /dev/rvn0 fd1440 2>&1 >/dev/null
+disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 2>&1 >/dev/null
 if [ "X$?" != "X0" ]
 then
 	echo "-> ERROR while labeling picobsd.bin on /dev/rvn0..."
 	echo "-> Aborting $0"
 	exit 10
 fi
 
 newfs -i 32768 -m 0 -p 0 -o space /dev/rvn0c 2>&1 >/dev/null
 
 mount /dev/vn0c /mnt
 
 pwd=`pwd`
 
 cd ../${TYPE}/floppy.tree
 echo "-> Copying language dependent files..."
 for i in hosts motd rc resolv.conf
 do
 	cat ../lang/${i}.${LANGUAGE} | \
 		sed -e "s/@VER@/${VER}/g" > \
 		etc/${i}
 done
 if [ "${TYPE}" != "router" ]
 then
 	cat ../lang/rc.conf.${LANGUAGE} | \
 		sed -e "s/@VER@/${VER}/g" > \
 		etc/rc.conf
 	cat ../lang/rc.network.${LANGUAGE}| \
 		sed -e "s/@VER@/${VER}/g" > \
 		etc/rc.network
 fi
 
 echo "-> Populating floppy filesystem..."
 cat ../lang/boot.help.${LANGUAGE} | \
 	sed -e "s/@VER@/${VER}/g" > \
 	/mnt/boot.help
 cp -pr . /mnt
 rm -rf /mnt/CVS /mnt/etc/CVS /mnt/etc/ppp/CVS
 if [ "${TYPE}" = "dial" ]
 then
 	pwd_mkdb -d etc/ etc/master.passwd
 	mv etc/spwd.db /mnt/etc/
 	rm etc/pwd.db
 fi
 
 if [ "X$?" != "X0" ]
 then
 	echo "-> ERROR while transferring ../${TYPE}/floppy.tree to /mnt..."
 	echo "-> Aborting $0"
 	exit 10
 fi
 
 cd ${pwd}
 cp kernel.gz /mnt/kernel.gz
 if [ "X$?" != "X0" ]
 then
 	echo "-> ERROR while transferring kernel.gz to /mnt..."
 	echo "-> Aborting $0"
 	exit 10
 fi
 mkdir /mnt/boot
 cp /boot/loader .
 kzip -v loader
 mv loader.kz /mnt/boot/loader
 rm -f loader loader.o
 echo "/boot/loader" >/mnt/boot.config
 echo "load /kernel">/mnt/boot/loader.rc
 echo "load -t userconfig_script /kernel.config">>/mnt/boot/loader.rc
 (echo "-> Fixing permissions"; cd /mnt; chown -R root *)
 rm kernel.gz
 
 df -ik /mnt
 
 umount /mnt
 vnconfig -u /dev/rvn0