MF4S: Syncronise with Luigi's work in -stable.

1 files changed, 11 insertions, 8 deletions

diff --git a/release/picobsd/mfs_tree/etc/rc b/release/picobsd/mfs_tree/etc/rc
index f427337..e695f69 100644
--- a/release/picobsd/mfs_tree/etc/rc
+++ b/release/picobsd/mfs_tree/etc/rc
@@ -1,5 +1,6 @@
 #!/bin/sh
 # $FreeBSD$
+### Special setup for one floppy PICOBSD ###
 # WARNING !!! We overwrite this file during execution with a new rc file.
 # Awful things happen if this file's size is > 1024B
 
@@ -10,21 +11,23 @@ trap : 3
 HOME=/; export HOME
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
 export PATH
+dev="/dev/fd0c" #
 
 trap "echo 'Reboot interrupted'; exit 1" 3
-
-### Special setup for one floppy PICOBSD ###
-dev="/dev/fd0c"
+# Copy from MFS version of the files, and then from FS version.
+cd /fd; cp -Rp etc root / ; cd /
 echo "Reading /etc from ${dev}..."
-mount -o rdonly ${dev} /mnt
-cd /mnt/etc ; cp -Rp . /etc/
-cp -Rp /mnt/root /
+mount -o rdonly ${dev} /fd
+cd /fd; cp -Rp etc root / ; cd / ; umount /fd
 cd /etc
 #rm files to stop overwrite warning
-rm rc login.conf
+for i in *; do
+    if [ -f $i.gz ]; then
+	rm $i
+    fi
+done
 gzip -d *.gz
 pwd_mkdb -p ./master.passwd
-umount /mnt
 echo "Ok. (Now you can remove ${dev} if you like)"
 echo ""
 . rc