Update to PicoBSD 0.44 from RELENG_3

7 files changed, 19 insertions, 20 deletions

diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile
index c47bae8..afc89eb 100644
--- a/release/picobsd/dial/crunch1/Makefile
+++ b/release/picobsd/dial/crunch1/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/10/15 21:39:59 abial Exp $
+# $Id: Makefile,v 1.3.2.1 1999/05/07 10:02:34 abial Exp $
 #
 NOCRYPT?=	yes
 SRC?=/usr/src
@@ -15,7 +15,7 @@ crunch:
 	fi;
 	@cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >>crunch1.conf
 	@crunchgen ${.CURDIR}/crunch1.conf
-	@${MAKE} -f crunch1.mk all -DRELEASE_CRUNCH NOCRYPT=${NOCRYPT} \
+	@${MAKE} -DRELEASE_CRUNCH -f crunch1.mk all NOCRYPT=yes \
 	    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY" #2>&1 >/dev/null
 
 clean:
diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf
index 3558ddd..06632c2 100644
--- a/release/picobsd/dial/crunch1/crunch.conf
+++ b/release/picobsd/dial/crunch1/crunch.conf
@@ -1,4 +1,4 @@
-# $Id: crunch.conf,v 1.4 1998/11/15 23:30:26 abial Exp $
+# $Id: crunch.conf,v 1.5.2.2 1999/05/21 15:39:08 roger Exp $
 #
 # NOTE1: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
@@ -16,9 +16,6 @@
 #   line 327)
 srcdirs /usr/ports/security/ssh/work/
 
-# ash, kget etc...
-srcdirs ../../tinyware
-
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -28,12 +25,15 @@ srcdirs /usr/src/gnu/usr.bin
 srcdirs /usr/src/usr.sbin
 srcdirs /usr/src/libexec
 
+# ns, vm etc...
+srcdirs ../../tinyware
+
 progs ppp ssh ftp telnet ee gzip more
 ln gzip gunzip
 ln gzip zcat
 ln gzip gzcat
 
-progs ash test kget echo pwd msg stty
+progs sh test kget echo pwd msg stty
 progs hostname cat kill sps vm ns
 progs chmod chown help
 progs cp df fsck ping mv ln traceroute
@@ -41,8 +41,7 @@ progs ifconfig kbdcontrol moused
 progs ls mkdir mount mount_msdos mount_cd9660 mount_ext2fs
 progs rm route sysctl umount
 progs vidcontrol
-ln ash sh
-ln ash -sh
+ln sh -sh
 ln test [
 ln sps ps
 ln msg dmesg
@@ -54,4 +53,4 @@ ln chown chgrp
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lgnuregex -lmp -lgmp -lm
 libs -lncurses -lmytinfo -lipx -lz
-libs -ltermcap -ltelnet -lalias
+libs -ltermcap -ltelnet -lalias -lradius
diff --git a/release/picobsd/dial/lang/README.en b/release/picobsd/dial/lang/README.en
index 299c940..518f8a3 100644
--- a/release/picobsd/dial/lang/README.en
+++ b/release/picobsd/dial/lang/README.en
@@ -1,4 +1,4 @@
-1998.07.22, Warsaw, Poland
+1999.04.22, Warsaw, Poland
 
 			PicoBSD @VER@ (DIALUP flavor)
 			---------------------------
@@ -103,4 +103,4 @@ Have fun!
 
 Andrzej Bialecki <abial@freebsd.org>
 
-$Id: README.en,v 1.3 1998/10/15 21:40:00 abial Exp $
+$Id: README.en,v 1.4.2.1 1999/05/07 10:02:37 abial Exp $
diff --git a/release/picobsd/dial/lang/dialup.en b/release/picobsd/dial/lang/dialup.en
index 23b5d8e..7023075 100755
--- a/release/picobsd/dial/lang/dialup.en
+++ b/release/picobsd/dial/lang/dialup.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: dialup.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: dialup.en,v 1.2.2.1 1999/05/07 10:02:39 abial Exp $
 set_resolv() {
 	echo ""
 	echo "                       Default Domain Name"
@@ -375,7 +375,7 @@ do
 		echo "We'll use the following arguments to 'ppp':"
 		echo ""
 		echo "		ppp -background dialup"
-		echo "
+		echo ""
 		echo -n "Would you like to change them? (y/n) "
 		read oo
 		if [ "X${oo}" = "Xy" ]
diff --git a/release/picobsd/dial/lang/dialup.pl b/release/picobsd/dial/lang/dialup.pl
index 2d65e84..3c93e17 100755
--- a/release/picobsd/dial/lang/dialup.pl
+++ b/release/picobsd/dial/lang/dialup.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: dialup.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: dialup.pl,v 1.2.2.1 1999/05/07 10:02:40 abial Exp $
 set_resolv() {
 	echo ""
 	echo "                       Domyślna Nazwa Domeny"
@@ -375,7 +375,7 @@ do
 		echo "Wystartujemy 'ppp' z poniższymi opcjami:"
 		echo ""
 		echo "		ppp -background dialup"
-		echo "
+		echo ""
 		echo -n "Czy chcesz je zmienic?? (t/n) "
 		read oo
 		if [ "X${oo}" = "Xt" ]
diff --git a/release/picobsd/dial/lang/update.en b/release/picobsd/dial/lang/update.en
index 8fff729..c99f5bb 100755
--- a/release/picobsd/dial/lang/update.en
+++ b/release/picobsd/dial/lang/update.en
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: update.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $
+# $Id: update.en,v 1.2.2.1 1999/05/07 10:02:41 abial Exp $
 pwd=`pwd`
 echo -n "Updating /etc contents on startup floppy...  "
 mount /dev/fd0a /start_floppy
@@ -14,7 +14,7 @@ cd /etc
 cp -Rp . /start_floppy/etc/
 echo " Done."
 echo -n "Updating kernel parameters...  "
-kget /start_floppy/kernel.config
+kget /start_floppy/boot/kernel.conf
 umount /dev/fd0a
 cd ${pwd}
 echo " Done."
diff --git a/release/picobsd/dial/mfs.tree/Makefile b/release/picobsd/dial/mfs.tree/Makefile
index 8a2d9f8..98a79b3 100644
--- a/release/picobsd/dial/mfs.tree/Makefile
+++ b/release/picobsd/dial/mfs.tree/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.5 1998/10/28 16:26:29 abial Exp $
+# $Id: Makefile,v 1.5.2.1 1999/05/09 22:03:54 abial Exp $
 #
 
 DESTDIR?=/mnt
@@ -65,7 +65,7 @@ devnodes: tree
 	ln -s /dev/MAKEDEV; \
 	./MAKEDEV std sysmouse tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 pty0; \
 	./MAKEDEV psm0; \
-	./MAKEDEV wd0s1h wd0s2 wd0s3 wd0s4 wd1s1h wd1s2 wd1s3 wd1s4; \
+	./MAKEDEV wd0s1h wd0s2 wd0s3 wd0s4 wd1s1h wd1s2 wd1s3 wd1s4 ;\
 	rm MAKEDEV)
 
 clean: