Various fixups and corrections to match the 3.0-RELEASE tree.

The PicoBSD version is now 0.42.

29 files changed, 168 insertions, 69 deletions

diff --git a/release/picobsd/README.html b/release/picobsd/README.html
index ddb663b2e66d..d8bc5dc89ba1 100644
--- a/release/picobsd/README.html
+++ b/release/picobsd/README.html
@@ -3,7 +3,8 @@
 <h1><b><center>           PicoBSD Development Kit      </center></b></h1>
 
 <p>All documentation, instructions, list of supported hardware and FAQ are
-in doc/ directory. The docs are marked with HTML tags, but we try to keep
+in doc/ directory. If they are missing, go to the doc/src/ subdirectory and
+do a 'make'. The docs are marked with HTML tags, but we try to keep
 them readable even without a browser.
 
 <p>Please start from <A HREF="doc/intro.html">here</a> for general
@@ -13,6 +14,6 @@ build your version of PicoBSD.
 
 <p>Enjoy!</p>
 
-<! $Id: README.html,v 1.3 1998/08/19 17:00:26 abial Exp $ >
+<! $Id: README.html,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ >
 </body>
 </html>
diff --git a/release/picobsd/Version b/release/picobsd/Version
index 210996fda78a..b9153dca573b 100644
--- a/release/picobsd/Version
+++ b/release/picobsd/Version
@@ -1 +1 @@
-VER=0.41
+VER=0.42
diff --git a/release/picobsd/build/clean b/release/picobsd/build/clean
index 6ecc51b67044..aa2330eb217f 100755
--- a/release/picobsd/build/clean
+++ b/release/picobsd/build/clean
@@ -1,7 +1,7 @@
 #! /bin/sh -
 
 #
-#	$Id: clean,v 1.5 1998/09/19 21:44:42 abial Exp $
+#	$Id: clean,v 1.6 1998/09/29 11:58:54 abial Exp $
 #
 set -e
 
@@ -14,10 +14,16 @@ fi
 if [ "$1" = "all" ]
 then
 	list="dial net isp router"
-	mv -f picobsd.bin picobsd.bin.old
+	if [ -f picobsd.bin ]
+	then
+		mv -f picobsd.bin picobsd.bin.old
+	fi
 else
 	list=$1
-	mv -f picobsd.bin picobsd.bin.$1
+	if [ -f picobsd.bin ]
+	then
+		mv -f picobsd.bin picobsd.bin.$1
+	fi
 fi
 
 rm -f kernel kernel.kz fs.PICOBSD *.o *core *.db
diff --git a/release/picobsd/dial/conf/Makefile b/release/picobsd/dial/conf/Makefile
index aafad23153cf..7fd4743f647f 100644
--- a/release/picobsd/dial/conf/Makefile
+++ b/release/picobsd/dial/conf/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1998/09/03 10:41:20 abial Exp $
+# $Id: Makefile,v 1.2 1998/09/29 12:12:31 abial Exp $
 #
 
 SRC?=/usr/src
@@ -12,7 +12,8 @@ all: $(KERNFILE)
 
 $(KERNFILE): PICOBSD
 	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	\"MFS_ROOT=${SIZE}\"" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile
index 467850d488ba..93b6d78b373e 100644
--- a/release/picobsd/dial/crunch1/Makefile
+++ b/release/picobsd/dial/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1998/08/10 19:38:39 abial Exp $
+# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
 #
 NOCRYPT?=	yes
 SRC?=/usr/src
@@ -16,7 +16,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >>crunch1.conf
 	@crunchgen ${.CURDIR}/crunch1.conf
 	@${MAKE} -f crunch1.mk all NOCRYPT=${NOCRYPT} \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY" 2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY" #2>&1 >/dev/null
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
diff --git a/release/picobsd/dial/lang/README.en b/release/picobsd/dial/lang/README.en
index 6e833a114faf..4b2ffad4fbd1 100644
--- a/release/picobsd/dial/lang/README.en
+++ b/release/picobsd/dial/lang/README.en
@@ -55,6 +55,38 @@ this!), here are the steps you should take:
 3.	Your console is blocked now, but you can use other virtual consoles
 	available under Alt-Fn.
 
+How to configure my Ethernet card?
+----------------------------------
+
+Hopefully your ethernet card is supported by PicoBSD kernel, and in case of
+ISA cards you have already set up correctly its parameters in UserConfig
+editor. You can check if PicoBSD found your card by looking into startup
+messages ('dmesg | more').
+
+The easiest way to do it is to edit /etc/rc.conf file ('ee /etc/rc.conf').
+Find the line which says 'network_interfaces' and add the name of your
+card to the list. Then add yet another line 'ifconfig_<if_name>' which
+actually sets up your IP address and netmask. E.g:
+
+	network_interfaces="lo0 ed0"
+	ifconfig_lo0="inet 127.0.0.1"
+	ifconfig_ed0="inet 192.168.0.1 netmask 255.255.255.0"
+
+Then you have to set up your default gateway, which is usually the router
+nearest to you (on the same LAN). E.g:
+
+	defaultrouter="192.168.0.100"
+
+Then you save this information on the floppy with 'update' command, and
+reboot.
+
+Of course, you can also issue the proper commands by hand:
+
+	ifconfig ed0 inet 192.168.0.1 netmask 255.255.255.0
+	route add default 192.168.0.100
+
+Once you do this, you should be able to 'ping' some remote IP address.
+
 Where to get additional info?
 -----------------------------
 
@@ -68,7 +100,7 @@ I'll put there also new versions of PicoBSD and bugfixes.
 I'll be glad hearing from you about your experiences with PicoBSD. Thanks.
 
 Have fun!
-  
+
 Andrzej Bialecki <abial@nask.pl>
 
-$Id: README.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+$Id: README.en,v 1.2 1998/09/26 17:27:19 abial Exp $
diff --git a/release/picobsd/dial/lang/README.pl b/release/picobsd/dial/lang/README.pl
index 47a38ba5fecf..974ac81f81f7 100644
--- a/release/picobsd/dial/lang/README.pl
+++ b/release/picobsd/dial/lang/README.pl
@@ -56,6 +56,41 @@ lub lubisz robić to sam, oto opis poszczególnych kroków:
 	których można się poruszać naciskając lewy Alt i klawisz funkcyjny
 	F1-F10.
 
+Jak skonfigurować kartę Ethernet?
+---------------------------------
+
+Miejmy nadzieję, że Twoja karta jest obsługiwana przez jądro dostępne na
+dyskietce, oraz że poprawnie ustawiłeś jej parametry (w przypadku kart
+ISA) w edytorze UserConfig. Możesz sprawdzić, czy PicoBSD wykryło tę kartę,
+patrząc na komunikaty startowe ('dmesg | more').
+
+Najłatwiejszym sposobem na skonfigurowanie dostepu LAN jest ustawienie
+parametrów w pliku konfiguracyjnym systemu ('ee /etc/rc.conf'). Znajdź linię,
+która zaczyna się od 'network_interfaces' i dopisz nazwę sterownika karty do
+listy interfejsów. Potem dodaj jeszcze jedną linię 'ifconfig_<nazwa>',
+która ustawi właściwy adres IP i maskę sieci. Np.:
+
+	network_interfaces="lo0 ed0"
+	ifconfig_lo0="inet 127.0.0.1"
+	ifconfig_ed0="inet 192.168.0.1 netmask 255.255.255.0"
+
+Następnie musisz ustawić swój domyślny router (jest to zazwyczaj adres IP
+routera w Twojej sieci LAN). Np.:
+
+	defaultrouter="192.168.0.100"
+
+Następnie zachowujesz te informacje na dyskietce startowej przy pomocy
+polecenia 'update', i restartujesz system.
+
+Oczywiście można też zrobić to ręcznie, wydając odpowiednie polecenia:
+
+	ifconfig ed0 inet 192.168.0.1 netmask 255.255.255.0
+	route add default 192.168.0.100
+
+Jeśli poprawnie wszystko ustawiłeś, powinieneś być w stanie uzyskać
+odpowiedź od swojego routera ('ping 192.168.0.100') oraz od jakiejś
+maszyny poza Twoją siecią.
+
 Skad wziąć dodatkowe informacje?
 --------------------------------
 
@@ -69,4 +104,4 @@ Miłej zabawy!
   
 Andrzej Białecki <abial@nask.pl>
 
-$Id: README.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+$Id: README.pl,v 1.2 1998/09/26 17:27:19 abial Exp $
diff --git a/release/picobsd/doc/src/bugs.html b/release/picobsd/doc/src/bugs.html
index d35d78743068..c878d0096831 100644
--- a/release/picobsd/doc/src/bugs.html
+++ b/release/picobsd/doc/src/bugs.html
@@ -1,5 +1,5 @@
 <HTML>
-<! $Id: bugs.html,v 1.2 1998/09/26 17:39:21 abial Exp $ >
+<! $Id: bugs.html,v 1.3 1998/10/12 07:52:34 abial Exp $ >
 <HEAD>
    <TITLE>History and Bug fixes</TITLE>
 </HEAD>
@@ -14,6 +14,15 @@ the list before reporting a new one.</p>
 <p>We tried to make this software bug-free, but life is life... Sorry for the
  inconvenience.</p>
 
+<h3>PicoBSD 0.42</h3>
+<ul>
+<li>
+	1998.10.15: Small fixes and updates to match the 3.0-RELEASE
+	source tree. The binary snapshot built from 3.0-R sources will
+	soon follow...
+</li>
+</ul>
+
 <h3>PicoBSD 0.41</h3>
 <ul>
 <li>
diff --git a/release/picobsd/doc/src/faq.html b/release/picobsd/doc/src/faq.html
index 8c8681f38127..c45b56e78477 100644
--- a/release/picobsd/doc/src/faq.html
+++ b/release/picobsd/doc/src/faq.html
@@ -1,5 +1,5 @@
 <HTML>
-<! $Id: faq.html,v 1.3 1998/08/31 13:08:16 abial Exp $ >
+<! $Id: faq.html,v 1.1 1998/09/26 17:23:01 abial Exp $ >
 <HEAD>
    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
    <META NAME="Author" CONTENT="Dinesh Nair">
@@ -26,12 +26,23 @@ isp. For a description of how each of the flavours differ, take a look
 at the <B><A HREF="http://www.freebsd.org/~picobsd/picobsd.html">PicoBSD
 home page</A></B>.
 
+<p><B>What is this "pico" in the name?</B></p>
+
+<p>It's an SI measure unit, which is equivalent of 10e<sup>-12</sup>.
+This is a good approximation of more colloquial "extremely small".</p>
+
+<p>You can also think of normal FreeBSD as a system infested with
+fully grown daemons, and PicoBSD as a system infested with
+"the little people" :-). </p>
+
 <P><B>What version of FreeBSD is PicoBSD based on ?</B></p>
 
-<P>PicoBSD has versions based on both FreeBSD 3.0-current and FreeBSD 2.2.5-RELEASE.
+<P>PicoBSD has versions based on FreeBSD 3.0-RELEASE, 3.0-current and
+FreeBSD 2.2.5-RELEASE.
 <A HREF="mailto:abial@nask.pl">Andrzej Bialecki</A> maintains the <A HREF="http://www.freebsd.org/~picobsd/picobsd.html">FreeBSD
-3.0-current version</A> and <A HREF="mailto:dinesh@alphaque.com">Dinesh
-Nair</A> maintains the <A HREF="http://info.net-gw.com/picoBSD/">FreeBSD
+3.0-RELEASE and -current versions</A> and 
+<A HREF="mailto:dinesh@alphaque.com">Dinesh Nair</A>
+maintains the <A HREF="http://info.net-gw.com/picoBSD/">FreeBSD
 2.2.5-RELEASE</A> version. Both the versions don't differ by much except
 for the following:
 <UL TYPE=CIRCLE>
@@ -81,7 +92,7 @@ locations:
 <UL TYPE=CIRCLE>
 <LI>
 <A HREF="http://www.freebsd.org/~picobsd/picobsd.html">PicoBSD based on
-FreeBSD 3.0-current</A> maintained by Andrzej Bialecki</LI>
+FreeBSD 3.0-RELEASE and -current</A> maintained by Andrzej Bialecki</LI>
 
 <LI>
 <A HREF="http://info.net-gw.com/picoBSD/">PicoBSD based on FreeBSD 2.2.5-RELEASE</A>
@@ -178,7 +189,8 @@ FreeBSD distribution.</p>
 <p><b>Using version 0.4 I get many  strange messages on my console...</b></p>
 <p>This is related in large part to DEVFS subsystem - it is still somewhat
 experimental, and its author left some diagnostics turned on.. They are
-harmless.</p>
+harmless. Versions 0.4x, x>0 don't use DEVFS at all, as it was too
+experimental to work reliably...</p>
 
 <P><B>How do I connect using PPP ?</B></p>
 
@@ -206,7 +218,8 @@ and disappears. and moving the mouse has no effect.</b></p>
 <p>You have the mouse driver configured to use the modem's serial port.
 Issue a 'ps -ax', remember the pid (process ID) of 'moused', then issue a
 'kill -9 <pid>'. Edit /etc/rc.conf to specify the correct mouse port. Issue
-an 'update' commmand to save new configuration to the floppy, and reboot.
+an 'update' commmand to save new configuration to the floppy, and reboot.</p>
+
 <P><B>I saved my lynx configuration but it was not there when I rebooted.
 Why ?</B>
 
@@ -228,7 +241,7 @@ Handbook</A> or the <A HREF="http://www.freebsd.org/">FreeBSD Home</A>.
 PicoBSD user community comes in. And big thanks to all of you who already
 sent us some suggestions!</FONT></CENTER>
 <P><B><FONT SIZE=-1>Last Modified:
-Sun Aug  9 13:40:15 CEST 1998
+Thu Oct 15 23:31:28 CEST 1998
 </FONT></B></P>
 </BODY>
 </HTML>
diff --git a/release/picobsd/isp/conf/Makefile b/release/picobsd/isp/conf/Makefile
index 214a175e65d6..52a6b75c6e3b 100644
--- a/release/picobsd/isp/conf/Makefile
+++ b/release/picobsd/isp/conf/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1998/09/03 10:41:25 abial Exp $
+# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $
 #
 
 SRC?=/usr/src
@@ -12,7 +12,8 @@ all: $(KERNFILE)
 
 $(KERNFILE): PICOBSD
 	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	\"MFS_ROOT=${SIZE}\"" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
diff --git a/release/picobsd/isp/crunch1/Makefile b/release/picobsd/isp/crunch1/Makefile
index abb2e2a69215..a5c69e8af06d 100644
--- a/release/picobsd/isp/crunch1/Makefile
+++ b/release/picobsd/isp/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: Makefile,v 1.2 1998/08/28 08:57:16 abial Exp $
 #
 SRC?=/usr/src
 
@@ -15,7 +15,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" 2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
 	@if [ -f .patched ]; then \
diff --git a/release/picobsd/isp/floppy.tree/etc/motd b/release/picobsd/isp/floppy.tree/etc/motd
index 66e7103bfa68..8efbc7f97a5a 100644
--- a/release/picobsd/isp/floppy.tree/etc/motd
+++ b/release/picobsd/isp/floppy.tree/etc/motd
@@ -1,6 +1,6 @@
 =======================================================
                                                 )\_)\
-PicoBSD 0.41 (ISP-alpha)                        (o,o)
+PicoBSD 0.42 (ISP-alpha)                        (o,o)
                                              __  \~/
 Witamy w PicoBSD!                            -->====\
                                              ~~  d d
diff --git a/release/picobsd/isp/floppy.tree/etc/rc b/release/picobsd/isp/floppy.tree/etc/rc
index 051d9917cc31..bcb8c2bd02fe 100644
--- a/release/picobsd/isp/floppy.tree/etc/rc
+++ b/release/picobsd/isp/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: rc.pl,v 1.2 1998/09/26 17:27:22 abial Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
@@ -47,7 +47,7 @@ if [ "x$swapfile" = "xNO" ]; then
 fi
 echo ''
 echo ''
-echo '+------------ PicoBSD 0.41 (ISP) --------------+'
+echo '+------------ PicoBSD 0.42 (ISP) --------------+'
 echo '|                                              |'
 echo '| Zaloguj sie jako "root" (haslo "setup").     |'
 echo '|                                              |'
diff --git a/release/picobsd/net/conf/Makefile b/release/picobsd/net/conf/Makefile
index 98eaaedb4257..52a6b75c6e3b 100644
--- a/release/picobsd/net/conf/Makefile
+++ b/release/picobsd/net/conf/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1998/09/03 10:41:29 abial Exp $
+# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $
 #
 
 SRC?=/usr/src
@@ -12,7 +12,8 @@ all: $(KERNFILE)
 
 $(KERNFILE): PICOBSD
 	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	\"MFS_ROOT=${SIZE}\"" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile
index f356c9de9fd9..0966f3830be6 100644
--- a/release/picobsd/net/crunch1/Makefile
+++ b/release/picobsd/net/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1998/08/10 19:39:06 abial Exp $
+# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
 #
 SRC?=/usr/src
 
@@ -15,7 +15,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" 2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
 	@if [ -f .patched ]; then \
diff --git a/release/picobsd/net/floppy.tree/etc/motd b/release/picobsd/net/floppy.tree/etc/motd
index ba30df0da0ef..547a0684b95b 100644
--- a/release/picobsd/net/floppy.tree/etc/motd
+++ b/release/picobsd/net/floppy.tree/etc/motd
@@ -1,6 +1,6 @@
 =======================================================
                                                 )\_)\
-PicoBSD 0.41 (NET)                              (o,o)
+PicoBSD 0.42 (NET)                              (o,o)
                                              __  \~/
 Witamy w PicoBSD!                            -->====\
                                              ~~  d d
diff --git a/release/picobsd/net/floppy.tree/etc/rc b/release/picobsd/net/floppy.tree/etc/rc
index 1d65d8b9f830..05c5f4f5b6f0 100644
--- a/release/picobsd/net/floppy.tree/etc/rc
+++ b/release/picobsd/net/floppy.tree/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $
+# $Id: rc.pl,v 1.2 1998/09/26 17:27:24 abial Exp $
 ############################################
 ### Special setup for one floppy PICOBSD ###
 ### THIS IS NOT THE NORMAL /etc/rc !!!!! ###
@@ -47,7 +47,7 @@ if [ "x$swapfile" = "xNO" ]; then
 fi
 echo ''
 echo ''
-echo '+------------ PicoBSD 0.41 (NET) --------------+'
+echo '+------------ PicoBSD 0.42 (NET) --------------+'
 echo '|                                              |'
 echo '| Zaloguj sie jako "root" (haslo "setup").     |'
 echo '|                                              |'
diff --git a/release/picobsd/router/conf/Makefile b/release/picobsd/router/conf/Makefile
index 442e504f71bd..52a6b75c6e3b 100644
--- a/release/picobsd/router/conf/Makefile
+++ b/release/picobsd/router/conf/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1998/09/03 10:41:36 abial Exp $
+# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $
 #
 
 SRC?=/usr/src
@@ -12,7 +12,8 @@ all: $(KERNFILE)
 
 $(KERNFILE): PICOBSD
 	cat PICOBSD | grep -v "MFS_ROOT" > ${CONF}/${CONFFILE}
-	echo "options	\"MFS_ROOT=${SIZE}\"" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT" >> ${CONF}/${CONFFILE}
+	echo "options	MFS_ROOT_SIZE=${SIZE}" >> ${CONF}/${CONFFILE}
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
diff --git a/release/picobsd/router/crunch1/Makefile b/release/picobsd/router/crunch1/Makefile
index 046ddacfbc42..77d5806090db 100644
--- a/release/picobsd/router/crunch1/Makefile
+++ b/release/picobsd/router/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/08/10 19:39:36 abial Exp $
+# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
 #
 SRC?=/usr/src
 
@@ -9,7 +9,7 @@ crunch:
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf
 	@crunchgen ./crunch1.conf
 	@${MAKE} -f crunch1.mk all \
-	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" 2>&1 >/dev/null
+	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null
 
 clean:
 	rm  -f *.o *.stub *.lo *_stub.c *.mk \
diff --git a/release/picobsd/router/floppy.tree/etc/motd b/release/picobsd/router/floppy.tree/etc/motd
index 25dcfec0875c..41b2fb6a7706 100644
--- a/release/picobsd/router/floppy.tree/etc/motd
+++ b/release/picobsd/router/floppy.tree/etc/motd
@@ -1,6 +1,6 @@
 =======================================================
                                                 )\_)\
-PicoBSD 0.41 (ROUTER)                           (o,o)
+PicoBSD 0.42 (ROUTER)                           (o,o)
                                              __  \~/
 Witamy w PicoBSD!                            -->====\
                                              ~~  d d
diff --git a/release/picobsd/router/floppy.tree/etc/rc b/release/picobsd/router/floppy.tree/etc/rc
index f835024846ec..13716d4d8745 100644
--- a/release/picobsd/router/floppy.tree/etc/rc
+++ b/release/picobsd/router/floppy.tree/etc/rc
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $
+# $Id: rc.pl,v 1.2 1998/09/26 17:27:26 abial Exp $
 ### Special setup for one floppy PICOBSD ###
 ifconfig lo0 inet 127.0.0.1 netmask 0xffffff00
 hostname pico
 echo ""
 echo ""
-echo '+----------- PicoBSD 0.41 (ROUTER) ------------+'
+echo '+----------- PicoBSD 0.42 (ROUTER) ------------+'
 echo '|                                              |'
 echo '| Ta wersja PicoBSD podlega w pelni licencji   |'
 echo '| BSD. Wiecej informacji mozna znalezc na      |'
diff --git a/release/picobsd/tinyware/kget/uc_eisa.c b/release/picobsd/tinyware/kget/uc_eisa.c
index aed003e29b6a..c0483fc8d3a2 100644
--- a/release/picobsd/tinyware/kget/uc_eisa.c
+++ b/release/picobsd/tinyware/kget/uc_eisa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_eisa.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_eisa.c,v 1.5 1998/09/14 19:14:11 jkh Exp $
  */
 
 #include <sys/types.h>
@@ -142,7 +142,7 @@ eisa_fill_in(struct kernel *kp, struct uc_eisa *epc, struct eisa_device_node *ed
 				     sizeof(struct eisa_driver));
 
   n=(char *)kv_to_u(kp, (u_int)edrv->name, 20);
-  asprintf(&epc->device, "%s%d", n, edn->dev.unit);
+  asprintf(&epc->device, "%s%lu", n, edn->dev.unit);
   free(n);
 
   n=(char *)kv_to_u(kp, (u_int)edn->dev.full_name, 40); /*XXX*/
diff --git a/release/picobsd/tinyware/kget/uc_isa.c b/release/picobsd/tinyware/kget/uc_isa.c
index b65e8d9aa822..6a5d750e49d9 100644
--- a/release/picobsd/tinyware/kget/uc_isa.c
+++ b/release/picobsd/tinyware/kget/uc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_isa.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_isa.c,v 1.5 1998/10/06 07:41:48 msmith Exp $
  */
 
 #include <sys/types.h>
@@ -44,7 +44,8 @@ get_isa_info(struct kernel *kp){
   char *name;
 
   if(kp->nl[ISA_BIOTAB].n_value || kp->nl[ISA_TTYTAB].n_value || kp->nl[ISA_NETTAB].n_value ||
-     kp->nl[ISA_NULLTAB].n_value || kp->nl[ISA_WDCTAB].n_value || kp->nl[ISA_FDCTAB].n_value) {
+     kp->nl[ISA_CAMTAB].n_value || kp->nl[ISA_NULLTAB].n_value || 
+     kp->nl[ISA_WDCTAB].n_value || kp->nl[ISA_FDCTAB].n_value) {
 
     idp = kp->isa_devp = (struct uc_isa *)malloc(sizeof(struct uc_isa));
     total=0; /* a running total of the number of isa devices */
@@ -158,10 +159,6 @@ get_isa_device(struct uc_isa *ip){
   list_append(list, tmp);
   free(tmp);
 
-  asprintf(&tmp, "%d", ip->modified );
-  list_append(list, tmp);
-  free(tmp);
-
   return(list);
 }
 
diff --git a/release/picobsd/tinyware/kget/uc_kmem.c b/release/picobsd/tinyware/kget/uc_kmem.c
index 38651e8204be..159fb150a5d4 100644
--- a/release/picobsd/tinyware/kget/uc_kmem.c
+++ b/release/picobsd/tinyware/kget/uc_kmem.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_kmem.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_kmem.c,v 1.3 1997/02/22 14:12:28 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/kget/uc_list.c b/release/picobsd/tinyware/kget/uc_list.c
index d0e5ac662d04..e2b6bd5cb584 100644
--- a/release/picobsd/tinyware/kget/uc_list.c
+++ b/release/picobsd/tinyware/kget/uc_list.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_list.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_list.c,v 1.3 1997/02/22 14:12:29 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/kget/uc_main.c b/release/picobsd/tinyware/kget/uc_main.c
index 97f207c548ee..2f39a11a1a96 100644
--- a/release/picobsd/tinyware/kget/uc_main.c
+++ b/release/picobsd/tinyware/kget/uc_main.c
@@ -46,6 +46,7 @@ FILE *f_out;
 static struct nlist _nl[] = {
     {"_isa_devtab_bio"},
     {"_isa_devtab_tty"},
+    {"_isa_devtab_cam"},
     {"_isa_devtab_net"},
     {"_isa_devtab_null"},
     {"_isa_biotab_wdc"},
diff --git a/release/picobsd/tinyware/kget/uc_main.h b/release/picobsd/tinyware/kget/uc_main.h
index 4f7662eab738..326b80622023 100644
--- a/release/picobsd/tinyware/kget/uc_main.h
+++ b/release/picobsd/tinyware/kget/uc_main.h
@@ -23,25 +23,26 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_main.h,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_main.h,v 1.5 1998/10/06 07:41:49 msmith Exp $
  */
 
 #define ISA_BIOTAB 0  
 #define ISA_TTYTAB 1
 #define ISA_NETTAB 2
-#define ISA_NULLTAB 3
-#define ISA_WDCTAB 4  
-#define ISA_FDCTAB 5
-#define EISA_SET 6
-#define EISA_LIST 7
-#define PCI_SET 8
-#define SCSI_LIST 9
-#define SCSI_BUSSES 10
-#define SCSI_CINIT 11
-#define SCSI_DINIT 12
-#define SCSI_TINIT 13
+#define ISA_CAMTAB 3
+#define ISA_NULLTAB 4
+#define ISA_WDCTAB 5
+#define ISA_FDCTAB 6
+#define EISA_SET 7
+#define EISA_LIST 8
+#define PCI_SET 9
+#define SCSI_LIST 10
+#define SCSI_BUSSES 11
+#define SCSI_CINIT 12
+#define SCSI_DINIT 13
+#define SCSI_TINIT 14
 /* symbols + the null terminator */
-#define NSYMBOLS 15
+#define NSYMBOLS 16
 
 struct kernel {
   int     fd;    /* file descriptor for the kernel image, either a binary or /dev/kmem */
diff --git a/release/picobsd/tinyware/kget/uc_pci.c b/release/picobsd/tinyware/kget/uc_pci.c
index ca6079034932..0d8e601c8b40 100644
--- a/release/picobsd/tinyware/kget/uc_pci.c
+++ b/release/picobsd/tinyware/kget/uc_pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: uc_pci.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $
+ * $Id: uc_pci.c,v 1.4 1997/02/22 14:12:33 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index 8cadb872a244..01f8b9741e5b 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: oinit.c,v 1.8 1998/08/11 06:53:47 abial Exp $
+ *	$Id: oinit.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $
  */
 
 /*
@@ -484,7 +484,7 @@ do_command(int shell, char *cmdline)
 	default:
 		while(waitpid(pid,&res,0)!=pid) continue;
 		if(WEXITSTATUS(res)) {
-			printf("%s exited with status %d\n",
+			printf("do_command(%s): exit code=%d\n",
 				av[0],WEXITSTATUS(res));
 		}
 		break;