From de8b1605aeb6036cca7c2ac75630f0696977fb45 Mon Sep 17 00:00:00 2001
From: dwhite <dwhite@FreeBSD.org>
Date: Tue, 25 Apr 2000 19:00:08 +0000
Subject: Commit PicoBSD mega-patch: . Bring PicoBSD up to date with -CURRENT
 reality. . Make PicoBSD smart and not spam /dev/vn0 and /mnt.  Now it uses
 the first   unused vn device and creates a temporary mountpoint in /tmp. .
 Miscellaneous build cleanups and optimizations.

Unfortunately the bridge, isp, and router floppies are too big and need
the axe treatment.  The install floppy needs updating to -CURRENT. Dial and
net build and (appear to) run OK.  I will be adressing these in the
near future (unless someone beats me to it :-) ).

PR:		misc/17737
Submitted by:	Omachonu Ogali <oogali@intranova.net>
---
 release/picobsd/floppy.tree/etc/fstab  |  1 -
 release/picobsd/floppy.tree/etc/mfs.rc | 12 +++++-------
 release/picobsd/floppy.tree/etc/update | 10 +++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'release/picobsd/floppy.tree')

diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index 9953147..38e4435 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,4 +1,3 @@
-proc				/proc		procfs	rw 0 0
 /dev/fd0c			/fd	ufs	rw,noauto 0 0
 /dev/wd0s1			/dos		msdos	rw,noauto 0 0
 /dev/wd0s1a			/wd		ufs	rw,noauto 0 0
diff --git a/release/picobsd/floppy.tree/etc/mfs.rc b/release/picobsd/floppy.tree/etc/mfs.rc
index 79fddf5..c82b583 100644
--- a/release/picobsd/floppy.tree/etc/mfs.rc
+++ b/release/picobsd/floppy.tree/etc/mfs.rc
@@ -14,16 +14,14 @@ export PATH
 trap "echo 'Reboot interrupted'; exit 1" 3
 
 ### Special setup for one floppy PICOBSD ###
-set `df /` ; dev="/dev/$8"
-echo "Reading /etc from ${dev}..."
-mount -o rdonly ${dev} /mnt
-cd /mnt/etc ; cp -Rp . /etc/
-cp -Rp /mnt/root /
+mount -o rdonly /dev/fd0 /start_floppy
+cd /start_floppy/etc ; cp -Rp . /etc/
+cp -Rp /start_floppy/root /
 cd /etc
 gzip -d *.gz
 pwd_mkdb -p ./master.passwd
-umount /mnt
-echo "Ok. (Now you can remove ${dev} if you like)"
+umount /start_floppy
+echo "Ok. (Now you can remove /dev/fd0 if you like)"
 echo ""
 . rc
 exit 0
diff --git a/release/picobsd/floppy.tree/etc/update b/release/picobsd/floppy.tree/etc/update
index b5aae37..c6ec9da 100755
--- a/release/picobsd/floppy.tree/etc/update
+++ b/release/picobsd/floppy.tree/etc/update
@@ -1,9 +1,9 @@
 #!/bin/sh
 # $FreeBSD$
 pwd=`pwd`
-set `df /` ; dev="/dev/$8"
+set `df /` ; dev="$8"
 echo -n "Updating /etc contents on ${dev}... "
-mount ${dev} /mnt
+mount ${dev} /start_floppy
 if [ "X$?" != "X0" ] ; then
 	echo ""
 	echo "Cannot mount ${dev} read-write!"
@@ -12,11 +12,11 @@ fi
 cd /etc
 rm *.db
 rm passwd
-cp -Rp . /mnt/etc/
+cp -Rp . /start_floppy/etc/
 pwd_mkdb master.passwd
 echo " Done."
 echo -n "Updating kernel parameters...  "
-kget /mnt/boot/kernel.conf
-umount /mnt
+kget /start_floppy/boot/kernel.conf
+umount /start_floppy
 cd ${pwd}
 echo " Done."
-- 
cgit v1.1