Merge from RELENG_3.

5 files changed, 8 insertions, 12 deletions

diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD
index 66c0249..36b13f9 100644
--- a/release/picobsd/isp/conf/PICOBSD
+++ b/release/picobsd/isp/conf/PICOBSD
@@ -1,5 +1,5 @@
 #
-# $Id: PICOBSD,v 1.8 1999/01/18 10:17:31 abial Exp $
+# $Id: PICOBSD,v 1.9 1999/02/10 02:26:04 des Exp $
 #
 
 machine		"i386"
@@ -54,7 +54,7 @@ disk		wd3	at wdc1 drive 1
 
 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+device		acd0	#IDE CD-ROM
 
 # syscons is the default console driver, resembling an SCO console
 
@@ -104,11 +104,7 @@ device	rp1	at isa? port 0x180 tty
 device cy0	at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
 device cy1	at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000
 
-device ppc0	at isa? port? net irq 7
-controller	ppbus0
-device		nlpt0	at ppbus?
-device		plip0	at ppbus?
-device		ppi0	at ppbus?
+device		lpt0	at isa? port? tty irq 7
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf
index 2c8e103..390e391 100644
--- a/release/picobsd/isp/crunch1/crunch.conf
+++ b/release/picobsd/isp/crunch1/crunch.conf
@@ -1,5 +1,5 @@
 #
-# $Id: crunch.conf,v 1.4 1998/09/15 11:12:18 abial Exp $
+# $Id: crunch.conf,v 1.5 1999/01/19 23:10:34 abial Exp $
 #
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -27,7 +27,7 @@ srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
 progs ash test echo hostname ln login getty
-progs inetd telnetd stty w msg kget natd
+progs inetd telnetd stty w msg kget natd reboot
 progs init fsck ifconfig df ps ns vm cat
 progs cp rm mkdir ls chmod chown
 progs sysctl route swapon pwd_mkdb dev_mkdb
diff --git a/release/picobsd/isp/floppy.tree/etc/fstab b/release/picobsd/isp/floppy.tree/etc/fstab
index ca519e8..64d34ca 100644
--- a/release/picobsd/isp/floppy.tree/etc/fstab
+++ b/release/picobsd/isp/floppy.tree/etc/fstab
@@ -1,4 +1,4 @@
-proc				/proc			procfs	rw 0 0
+#proc				/proc			procfs	rw 0 0
 #/dev/fd0c			/start_floppy		ufs	rw 1 1
 #/dev/wd0s1			/dos		msdos	rw 0 0
 #/dev/wcd0c			/cdrom		cd9660	ro,noauto 0 0
diff --git a/release/picobsd/isp/lang/motd.en b/release/picobsd/isp/lang/motd.en
index 77a1949..86b4f8a 100644
--- a/release/picobsd/isp/lang/motd.en
+++ b/release/picobsd/isp/lang/motd.en
@@ -4,7 +4,7 @@ PicoBSD @VER@ (ISP-alpha)                   (o,o)
                                         __  \~/
 Welcome to PicoBSD!                     -->====\
                                         ~~  d d
-You can find a short description of the   pico
+You can find a short description of the   picoBSD
 system in file /README. You can view it using
 "more /README".
 
diff --git a/release/picobsd/isp/lang/motd.pl b/release/picobsd/isp/lang/motd.pl
index 1ceed38..749792d 100644
--- a/release/picobsd/isp/lang/motd.pl
+++ b/release/picobsd/isp/lang/motd.pl
@@ -4,7 +4,7 @@ PicoBSD @VER@ (ISP-alpha)                        (o,o)[37
                                              __  \~/
 Witamy w PicoBSD!                            -->====\
                                              ~~  d d
-W glownym katalogu w pliku README znajdziesz   pico
+W glownym katalogu w pliku README znajdziesz   picoBSD
 krotki opis systemu. Mozesz go obejrzec przy pomocy
 "more /README".