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

22 files changed, 93 insertions, 252 deletions

diff --git a/release/picobsd/floppy.tree/boot.config b/release/picobsd/floppy.tree/boot.config
deleted file mode 100644
index e69de29..0000000
--- a/release/picobsd/floppy.tree/boot.config
+++ /dev/null
diff --git a/release/picobsd/floppy.tree/etc/fstab b/release/picobsd/floppy.tree/etc/fstab
index 38e4435..9953147 100644
--- a/release/picobsd/floppy.tree/etc/fstab
+++ b/release/picobsd/floppy.tree/etc/fstab
@@ -1,3 +1,4 @@
+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/login.conf b/release/picobsd/floppy.tree/etc/login.conf
deleted file mode 100644
index 4337b1f..0000000
--- a/release/picobsd/floppy.tree/etc/login.conf
+++ /dev/null
@@ -1,118 +0,0 @@
-# This file controls resource limits, accounting limits and
-# default user environment settings.
-#
-# $FreeBSD$
-#
-
-
-# Authentication methods
-
-auth-defaults:\
-	:auth=passwd:
-
-auth-root-defaults:\
-	:auth-login=passwd:\
-	:auth-rlogin=passwd:\
-
-auth-ftp-defaults:\
-	:auth=passwd:
-
-# Example defaults
-# These settings are used by login(1) by default for classless users
-# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
-
-default:\
-	:cputime=infinity:\
-	:datasize-cur=22M:\
-	:stacksize-cur=8M:\
-	:memorylocked-cur=10M:\
-	:memoryuse-cur=30M:\
-	:filesize=infinity:\
-	:coredumpsize=0:\
-	:maxproc-cur=64:\
-	:openfiles-cur=64:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-defaults:
-
-# standard - standard user defaults
-#
-standard:\
-	:copyright=/etc/COPYRIGHT:\
-	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
-	:path=~/bin /bin /usr/bin:\
-	:nologin=/var/run/nologin:\
-	:cputime=1h30m:\
-	:datasize=8M:\
-	:stacksize=2M:\
-	:memorylocked=4M:\
-	:memoryuse=8M:\
-	:filesize=8M:\
-	:coredumpsize=0:\
-	:openfiles=24:\
-	:maxproc=32:\
-	:priority=0:\
-	:requirehome:\
-	:passwordtime=90d:\
-	:umask=002:\
-	:ignoretime@:\
-	:tc=default:
-#
-# Staff users - few restrictions and allow login anytime
-#
-staff:\
-	:ignorenologin:\
-	:ignoretime:\
-	:requirehome@:\
-	:accounted@:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:umask=022:\
-	:tc=standard:
-
-
-#
-# root - fallback for root logins
-#
-root:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:cputime=infinity:\
-	:datasize=infinity:\
-	:stacksize=infinity:\
-	:memorylocked=infinity:\
-	:memoryuse=infinity:\
-	:filesize=infinity:\
-	:coredumpsize=0:\
-	:openfiles=infinity:\
-	:maxproc=infinity:\
-	:memoryuse-cur=32M:\
-	:maxproc-cur=64:\
-	:openfiles-cur=1024:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-root-defaults:\
-#
-# Settings used by /etc/rc
-#
-daemon:\
-	:coredumpsize@:\
-	:coredumpsize-cur=0:\
-	:datasize=infinity:\
-	:datasize-cur@:\
-	:maxproc=512:\
-	:maxproc-cur@:\
-	:memoryuse-cur=64M:\
-	:memorylocked-cur=64M:\
-	:openfiles=1024:\
-	:openfiles-cur@:\
-	:stacksize=16M:\
-	:stacksize-cur@:\
-	:tc=default:
-#
-# Polish Users Accounts. Setup proper environment variables.
-#
-polish:Polish Users Accounts:\
-	:lang=pl_pl.ISO-8859-2:\
-	:tc=default:
diff --git a/release/picobsd/floppy.tree/etc/mfs.login.conf b/release/picobsd/floppy.tree/etc/mfs.login.conf
deleted file mode 100644
index ba74169..0000000
--- a/release/picobsd/floppy.tree/etc/mfs.login.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# $FreeBSD$
-
-# Authentication methods
-
-auth-defaults:\
-	:auth=krb_skey_or_passwd,passwd,kerberos,skey:
-
-auth-root-defaults:\
-	:auth-login=krb_skey_or_passwd,passwd,kerberos,skey:\
-	:auth-rlogin=krb_or_skey,kerberos,skey:
-auth-ftp-defaults:\
-	:auth=skey_or_pwd,passwd,skey:
-# Example defaults
-default:\
-	:cputime=infinity:\
-	:datasize-cur=22M:\
-	:stacksize-cur=8M:\
-	:memorylocked-cur=10M:\
-	:memoryuse-cur=30M:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:maxproc-cur=64:\
-	:openfiles-cur=64:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-defaults:
-
-# root - fallback for root logins
-root:\
-	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
-	:cputime=infinity:\
-	:datasize=infinity:\
-	:stacksize=infinity:\
-	:memorylocked=infinity:\
-	:memoryuse=infinity:\
-	:filesize=infinity:\
-	:coredumpsize=infinity:\
-	:openfiles=infinity:\
-	:maxproc=infinity:\
-	:memoryuse-cur=32M:\
-	:maxproc-cur=64:\
-	:openfiles-cur=1024:\
-	:priority=0:\
-	:requirehome@:\
-	:umask=022:\
-	:tc=auth-root-defaults:
-# Settings used by /etc/rc
-daemon:\
-	:coredumpsize@:\
-	:coredumpsize-cur=0:\
-	:datasize=infinity:\
-	:datasize-cur@:\
-	:maxproc=512:\
-	:maxproc-cur@:\
-	:memoryuse-cur=64M:\
-	:memorylocked-cur=64M:\
-	:openfiles=1024:\
-	:openfiles-cur@:\
-	:stacksize=16M:\
-	:stacksize-cur@:\
-	:tc=default:
diff --git a/release/picobsd/floppy.tree/etc/mfs.rc b/release/picobsd/floppy.tree/etc/mfs.rc
deleted file mode 100644
index c82b583..0000000
--- a/release/picobsd/floppy.tree/etc/mfs.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-# WARNING !!! We remove this file during execution (see EOF).
-# Awful things happen if its size is > 1024B
-
-stty status '^T'
-trap : 2
-trap : 3
-
-HOME=/; export HOME
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
-export PATH
-
-trap "echo 'Reboot interrupted'; exit 1" 3
-
-### Special setup for one floppy PICOBSD ###
-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 /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/rc.conf b/release/picobsd/floppy.tree/etc/rc.conf
index 12744ff..d597aa8 100644
--- a/release/picobsd/floppy.tree/etc/rc.conf
+++ b/release/picobsd/floppy.tree/etc/rc.conf
@@ -34,10 +34,10 @@ read_address() {
     echo "Please enter a hostname and IP address for your system $main_ether"
     read hostname the_ip
     if [ "X$hostname" != "X" ] ; then
-       echo "# $main_ether $hostname" >> /etc/hosts
-       echo "$the_ip $hostname" >> /etc/hosts
+	echo "# $main_ether $hostname" >> /etc/hosts
+	echo "$the_ip $hostname" >> /etc/hosts
     else
-       hostname=default
+	hostname=default
     fi
 }
 
@@ -55,10 +55,10 @@ while read a b c ; do
 done < /etc/hosts
 if [ "X$hostname" = "X" -o "X$hostname" = "X." ] ; then
     if [ "X$main_ether" = "X" ] ; then
-       echo "No ethernets found, using localhost"
-       hostname=localhost
+	echo "No ethernets found, using localhost"
+	hostname=localhost
     else
-       read_address
+	read_address
     fi
 fi
 
diff --git a/release/picobsd/floppy.tree/etc/update b/release/picobsd/floppy.tree/etc/update
deleted file mode 100755
index c6ec9da..0000000
--- a/release/picobsd/floppy.tree/etc/update
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-pwd=`pwd`
-set `df /` ; dev="$8"
-echo -n "Updating /etc contents on ${dev}... "
-mount ${dev} /start_floppy
-if [ "X$?" != "X0" ] ; then
-	echo ""
-	echo "Cannot mount ${dev} read-write!"
-	exit 1
-fi
-cd /etc
-rm *.db
-rm passwd
-cp -Rp . /start_floppy/etc/
-pwd_mkdb master.passwd
-echo " Done."
-echo -n "Updating kernel parameters...  "
-kget /start_floppy/boot/kernel.conf
-umount /start_floppy
-cd ${pwd}
-echo " Done."
diff --git a/release/picobsd/floppy.tree/kernel.config b/release/picobsd/floppy.tree/kernel.config
deleted file mode 100644
index e69de29..0000000
--- a/release/picobsd/floppy.tree/kernel.config
+++ /dev/null
diff --git a/release/picobsd/floppy.tree/root/.profile b/release/picobsd/floppy.tree/root/.profile
deleted file mode 100644
index dfe32d4..0000000
--- a/release/picobsd/floppy.tree/root/.profile
+++ /dev/null
@@ -1 +0,0 @@
-set -E # just make the shell understand arrow keys
diff --git a/release/picobsd/floppy.tree/etc/disktab b/release/picobsd/mfs_tree/etc/disktab
index ba97b44..f5b0097 100644
--- a/release/picobsd/floppy.tree/etc/disktab
+++ b/release/picobsd/mfs_tree/etc/disktab
@@ -1,4 +1,4 @@
-#
+# $FreeBSD$
 # Floppy formats:
 #
 # To make a filesystem on a floppy:
diff --git a/release/picobsd/floppy.tree/etc/gettytab b/release/picobsd/mfs_tree/etc/gettytab
index d2e252c..0917332 100644
--- a/release/picobsd/floppy.tree/etc/gettytab
+++ b/release/picobsd/mfs_tree/etc/gettytab
@@ -1,3 +1,4 @@
+# $FreeBSD$
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 default:\
diff --git a/release/picobsd/floppy.tree/etc/group b/release/picobsd/mfs_tree/etc/group
index abbd733..abbd733 100644
--- a/release/picobsd/floppy.tree/etc/group
+++ b/release/picobsd/mfs_tree/etc/group
diff --git a/release/picobsd/mfs_tree/etc/login.conf b/release/picobsd/mfs_tree/etc/login.conf
index 60e50f4..4337b1f 100644
--- a/release/picobsd/mfs_tree/etc/login.conf
+++ b/release/picobsd/mfs_tree/etc/login.conf
@@ -1,16 +1,26 @@
+# This file controls resource limits, accounting limits and
+# default user environment settings.
+#
 # $FreeBSD$
+#
+
 
 # Authentication methods
 
 auth-defaults:\
-	:auth=krb_skey_or_passwd,passwd,kerberos,skey:
+	:auth=passwd:
 
 auth-root-defaults:\
-	:auth-login=krb_skey_or_passwd,passwd,kerberos,skey:\
-	:auth-rlogin=krb_or_skey,kerberos,skey:
+	:auth-login=passwd:\
+	:auth-rlogin=passwd:\
+
 auth-ftp-defaults:\
-	:auth=skey_or_pwd,passwd,skey:
+	:auth=passwd:
+
 # Example defaults
+# These settings are used by login(1) by default for classless users
+# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
+
 default:\
 	:cputime=infinity:\
 	:datasize-cur=22M:\
@@ -26,7 +36,45 @@ default:\
 	:umask=022:\
 	:tc=auth-defaults:
 
+# standard - standard user defaults
+#
+standard:\
+	:copyright=/etc/COPYRIGHT:\
+	:welcome=/etc/motd:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
+	:path=~/bin /bin /usr/bin:\
+	:nologin=/var/run/nologin:\
+	:cputime=1h30m:\
+	:datasize=8M:\
+	:stacksize=2M:\
+	:memorylocked=4M:\
+	:memoryuse=8M:\
+	:filesize=8M:\
+	:coredumpsize=0:\
+	:openfiles=24:\
+	:maxproc=32:\
+	:priority=0:\
+	:requirehome:\
+	:passwordtime=90d:\
+	:umask=002:\
+	:ignoretime@:\
+	:tc=default:
+#
+# Staff users - few restrictions and allow login anytime
+#
+staff:\
+	:ignorenologin:\
+	:ignoretime:\
+	:requirehome@:\
+	:accounted@:\
+	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
+	:umask=022:\
+	:tc=standard:
+
+
+#
 # root - fallback for root logins
+#
 root:\
 	:path=~/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\
 	:cputime=infinity:\
@@ -44,8 +92,10 @@ root:\
 	:priority=0:\
 	:requirehome@:\
 	:umask=022:\
-	:tc=auth-root-defaults:
+	:tc=auth-root-defaults:\
+#
 # Settings used by /etc/rc
+#
 daemon:\
 	:coredumpsize@:\
 	:coredumpsize-cur=0:\
@@ -60,3 +110,9 @@ daemon:\
 	:stacksize=16M:\
 	:stacksize-cur@:\
 	:tc=default:
+#
+# Polish Users Accounts. Setup proper environment variables.
+#
+polish:Polish Users Accounts:\
+	:lang=pl_pl.ISO-8859-2:\
+	:tc=default:
diff --git a/release/picobsd/mfs_tree/etc/motd b/release/picobsd/mfs_tree/etc/motd
new file mode 100644
index 0000000..f52622f
--- /dev/null
+++ b/release/picobsd/mfs_tree/etc/motd
@@ -0,0 +1,9 @@
+==============================================================
+
+     )\_)\    Welcome to PicoBSD
+     (o,o)
+  __  \~/
+  -->====\
+  ~~  d d
+
+==============================================================
diff --git a/release/picobsd/floppy.tree/etc/protocols b/release/picobsd/mfs_tree/etc/protocols
index 9555c28..0fb7873 100644
--- a/release/picobsd/floppy.tree/etc/protocols
+++ b/release/picobsd/mfs_tree/etc/protocols
@@ -1,4 +1,4 @@
-#
+# $FreeBSD$
 # Internet (IP) protocols
 ip	0	IP		# internet protocol, pseudo protocol number
 icmp	1	ICMP		# internet control message protocol
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
diff --git a/release/picobsd/floppy.tree/etc/rc.network b/release/picobsd/mfs_tree/etc/rc.network
index 235db0a..235db0a 100644
--- a/release/picobsd/floppy.tree/etc/rc.network
+++ b/release/picobsd/mfs_tree/etc/rc.network
diff --git a/release/picobsd/floppy.tree/etc/rc.serial b/release/picobsd/mfs_tree/etc/rc.serial
index 40fbd8a..40fbd8a 100644
--- a/release/picobsd/floppy.tree/etc/rc.serial
+++ b/release/picobsd/mfs_tree/etc/rc.serial
diff --git a/release/picobsd/floppy.tree/etc/remote b/release/picobsd/mfs_tree/etc/remote
index 6f9fcaf..8d17cc5 100644
--- a/release/picobsd/floppy.tree/etc/remote
+++ b/release/picobsd/mfs_tree/etc/remote
@@ -1,5 +1,5 @@
 #	@(#)remote	5.2 (Berkeley) 6/30/90
-#
+# $FreeBSD$
 # remote -- remote host description file
 # see tip(1), remote(5)
 #
diff --git a/release/picobsd/floppy.tree/etc/services b/release/picobsd/mfs_tree/etc/services
index eec499f..eec499f 100644
--- a/release/picobsd/floppy.tree/etc/services
+++ b/release/picobsd/mfs_tree/etc/services
diff --git a/release/picobsd/floppy.tree/etc/shells b/release/picobsd/mfs_tree/etc/shells
index df377f1..cd386f6 100644
--- a/release/picobsd/floppy.tree/etc/shells
+++ b/release/picobsd/mfs_tree/etc/shells
@@ -1,3 +1,4 @@
+# $FreeBSD$
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
 # one of these shells.
diff --git a/release/picobsd/floppy.tree/etc/termcap b/release/picobsd/mfs_tree/etc/termcap
index dfbccb2..dfbccb2 100644
--- a/release/picobsd/floppy.tree/etc/termcap
+++ b/release/picobsd/mfs_tree/etc/termcap