diff options
26 files changed, 145 insertions, 119 deletions
diff --git a/release/picobsd/Version b/release/picobsd/Version index c9e1c0c..45d3356 100644 --- a/release/picobsd/Version +++ b/release/picobsd/Version @@ -1 +1 @@ -VER=0.43 +VER=0.44 diff --git a/release/picobsd/build/build b/release/picobsd/build/build index 58d347c..0ba02e4 100755 --- a/release/picobsd/build/build +++ b/release/picobsd/build/build @@ -1,7 +1,7 @@ #!/bin/sh - # -# $Id: build,v 1.11 1999/01/14 23:14:45 abial Exp $ +# $Id: build,v 1.12.2.1 1999/02/22 21:25:15 abial Exp $ # # You can set the SRC variable which points to your source tree. It's @@ -107,6 +107,23 @@ do done } +# check for existing custom config directory and ask user if they want to use it + +check_for_old_custom() { + KEEP_CUSTOM=no + if [ ! -d ../custom ] + then + return + fi + clear + echo " Custom directory setup" + echo "" + echo "There is an existing custom configuration linked to" + ls -l ../custom | awk -F\> '{ print $2 }' | awk '{ print $1 }' + echo "" + read -p "Do you wish to use the existing custom directory? (yes/no): " KEEP_CUSTOM +} + # Ask for, and set the custom config directory set_custom() { @@ -249,11 +266,16 @@ set_type() { then INIT=oinit fi - if [ "X${TYPE}" = "Xcustom" ] - then - set_custom - (cd ..; ln -sf ${CUST_DIR} custom) - fi + if [ "X${TYPE}" = "Xcustom" ] + then + check_for_old_custom + if [ "X${KEEP_CUSTOM}" != "Xyes" ] + then + [ -r ../custom ] && rm -f ../custom + set_custom + (cd ..; ln -sf ${CUST_DIR} custom) + fi + fi if [ "X${TYPE}" = "Xdial" -a "X${INIT}" = "X" ] then set_init diff --git a/release/picobsd/build/populate b/release/picobsd/build/populate index 14d54ff..67f16a7 100755 --- a/release/picobsd/build/populate +++ b/release/picobsd/build/populate @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: populate,v 1.9 1999/02/12 20:35:08 abial Exp $ +# $Id: populate,v 1.8.2.4 1999/05/07 10:02:30 abial Exp $ # . ../Version @@ -29,7 +29,7 @@ else cat ../lang/mfs.rc.${LANGUAGE} | \ sed -e "s/@VER@/${VER}/g" > \ /mnt/etc/rc - cp login.conf /mnt/etc/login.conf + cp ../../dial/mfs.tree/login.conf /mnt/etc/login.conf cat ../lang/README.${LANGUAGE} | \ sed -e "s/@VER@/${VER}/g" > \ /mnt/README diff --git a/release/picobsd/build/stage3 b/release/picobsd/build/stage3 index 95c5495..bf4fee2 100755 --- a/release/picobsd/build/stage3 +++ b/release/picobsd/build/stage3 @@ -1,7 +1,7 @@ #! /bin/sh - # -# $Id: stage3,v 1.4 1999/01/14 23:14:46 abial Exp $ +# $Id: stage3,v 1.4.2.3 1999/05/07 10:02:31 abial Exp $ # set -e @@ -66,9 +66,6 @@ then fi echo "-> Populating floppy filesystem..." -cat ../lang/boot.help.${LANGUAGE} | \ - sed -e "s/@VER@/${VER}/g" > \ - /mnt/boot.help cp -pr . /mnt rm -rf /mnt/CVS /mnt/etc/CVS /mnt/etc/ppp/CVS if [ "${TYPE}" = "dial" ] @@ -94,13 +91,27 @@ then exit 10 fi mkdir /mnt/boot +mkdir /mnt/boot/defaults cp /boot/loader . +# Make sure we have the a.out stubs we need... +if [ ! -f /usr/lib/aout/kzhead.o ] +then + (cd ${SRC}/sys/i386/boot/kzipboot && make all install clean) +fi kzip -v loader mv loader.kz /mnt/boot/loader rm -f loader loader.o -echo "/boot/loader" >/mnt/boot.config -echo "load /kernel">/mnt/boot/loader.rc -echo "load -t userconfig_script /kernel.config">>/mnt/boot/loader.rc +#echo "/boot/loader" >/mnt/boot.config +cp ${SRC}/sys/boot/forth/loader.4th /mnt/boot/ +cp ${SRC}/sys/boot/forth/support.4th /mnt/boot/ +cp ${SRC}/sys/boot/forth/loader.conf /mnt/boot/defaults +echo "userconfig_script_load=\"YES\"">/mnt/boot/loader.conf +for i in frames screen +do + cp ${SRC}/share/examples/bootforth/${i}.4th /mnt/boot/ +done +cp ../forth/loader.rc /mnt/boot/loader.rc +cp ../forth/menu.4th /mnt/boot/menu.4th (echo "-> Fixing permissions"; cd /mnt; chown -R root *) rm kernel.gz 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 "[H[J" echo "[1m Default Domain Name[m" @@ -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 "[H[J" echo "[1m Domyślna Nazwa Domeny[m" @@ -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: diff --git a/release/picobsd/doc/src/TODO.html b/release/picobsd/doc/src/TODO.html index 8192f02..514dd02 100644 --- a/release/picobsd/doc/src/TODO.html +++ b/release/picobsd/doc/src/TODO.html @@ -1,5 +1,5 @@ <html> -<! $Id: TODO.html,v 1.2 1998/12/22 21:40:56 abial Exp $ > +<! $Id: TODO.html,v 1.3.2.1 1999/05/07 10:02:45 abial Exp $ > <body> <h1><center> Small FreeBSD ToDo List. </center></h1> @@ -21,7 +21,7 @@ part of the work, please contact the coordinator of PicoBSD project <li> Eliminate need for patching FreeBSD source tree - either by keeping our own version of Makefiles, or by adding (many) knobs to -the standard ones. (NOTE: this will be resolved in v. 0.44). +the standard ones. (NOTE: this will be resolved in v. 0.45). </li> <li> Provide options for building separate kernel and FS images of @@ -33,7 +33,7 @@ and "net" for most common tasks. </li> <li> Replace most of currently used scripts with Makefiles. -(NOTE: this will be resolved in v. 0.44). +(NOTE: this will be resolved in v. 0.45). </li> <li> Add simple authentication module to oinit. @@ -57,6 +57,11 @@ etc, and write a short practical guide to embedding FreeBSD. <ul> <li> +Change currently used crunched binaries to something more flexible +- as it is now, even small change in set of programs requires +rebuilding of the whole image. +</li> +<li> Change the building process so that it allows to easily choose (with finer granularity) needed components of the target system. </li> @@ -67,12 +72,7 @@ removing drivers when running stripped kernels. <li> Investigate pros and cons of using the new boot/loader together with ELF kernels. -(NOTE for v.0.43: it was simply mandatory to use it :-) -</li> -<li> -Change currently used crunched binaries to something more flexible -- as it is now, even small change in set of programs requires -rebuilding of the whole image. +(NOTE for v.0.43: it was simply mandatory to start to use it :-) </li> <li> Provide options for building systems which operate from diff --git a/release/picobsd/doc/src/bugs.html b/release/picobsd/doc/src/bugs.html index 2eb29ce..0ba3c5a 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.6 1998/11/01 20:01:40 abial Exp $ > +<! $Id: bugs.html,v 1.7.2.1 1999/05/07 10:02:46 abial Exp $ > <HEAD> <TITLE>History and Bug fixes</TITLE> </HEAD> @@ -14,6 +14,13 @@ 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.44</h3> +<ul> +<li> + 1999.05.10: Slightly refreshed version to match 3.2-RELEASE. + No significant changes (yet)... :-( +</li> +</ul> <h3>PicoBSD 0.43</h3> <ul> <li> diff --git a/release/picobsd/doc/src/faq.html b/release/picobsd/doc/src/faq.html index 1a86d58..462739b 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/10/28 16:16:31 abial Exp $ > +<! $Id: faq.html,v 1.4.2.1 1999/05/07 10:02:48 abial Exp $ > <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> <META NAME="Author" CONTENT="Dinesh Nair"> @@ -37,26 +37,22 @@ fully grown daemons, and PicoBSD as a system infested with <P><B>What version of FreeBSD is PicoBSD based on ?</B></p> -<P>PicoBSD has versions based on FreeBSD 3.0-RELEASE, 3.0-current and +<P>PicoBSD has versions based on FreeBSD 3.2-RELEASE, 4.0-current and FreeBSD 2.2.5-RELEASE. <A HREF="mailto:abial@freebsd.org">Andrzej Bialecki</A> maintains the <A HREF="http://www.freebsd.org/~picobsd/picobsd.html">FreeBSD -3.0-RELEASE and -current versions</A> and +3.x-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: +2.2.5-RELEASE</A> version. Both the versions are different: <UL TYPE=CIRCLE> <LI> -the 3.0-current version is, well, more current so it has support for the -latest whiz-bang devices; on the other hand, it sometimes mean it can -provide functionality not yet present in 2.2.5-RELEASE</LI> +the 3.x-RELEASE version is the one actively maintained, and provides support +for many new devices</li> <LI> -the 2.2.5-RELEASE version is more stable and since binary sizes are smaller, -it sometimes has a little more functionality than the 3.0-current version</LI> +the 2.2.5-RELEASE version is not maintained anymore - the only difference is +that it has lynx on board.</li> </UL> -As far as possible, both versions will be kept functionally similar, but -occasionaly divergence may occur. <p><b>What is current version of PicoBSD?</b></p> @@ -84,7 +80,7 @@ external or internal. For LAN access, an Ethernet NIC (support for 3Com, NE2000 etc available) would also be required. <p>In case of "router" flavor, its requirements are even smaller: it can -run in only 4MB of RAM, on a 386SX CPU.</p> +run in as low as 4MB of RAM, on a 386SX CPU.</p> <P><B>Where do I get PicoBSD?</B></p> PicoBSD is available at the following @@ -96,7 +92,7 @@ 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> -maintained by Dinesh Nair</LI> +prepared by Dinesh Nair</LI> </UL> Additional mirror sites will be brought online as demand increases. If you're interested in mirroring the PicoBSD distribution, please get in @@ -133,13 +129,13 @@ Replace the <U>domain</U> with your domain and change the <U>nameserver</U> IP address to your nameserver or your ISP's nameserver. You may have as many <U>nameserver</U> lines as you want. Don't forget to run <I>/stand/update</I> to commit your changes to the floppy. -<p>NOTE: starting with version 0.4, the <i>dialup</i> scripts asks you to +<p>NOTE: starting with version 0.4, the <i>dialup</i> script asks you to set your nameserver as well as default domain name.</p> <p><b>I can't execute the <i>/stand/update</i> on the "router" floppy.</b></p> <p>The "router" floppy doesn't contain any real shell, so some commands work differently (and some don't work at all). In order to use this script you -have to source it in, i.e.: +have to 'source it in', i.e.: <pre> (48)/# pwd / diff --git a/release/picobsd/doc/src/hardware.html b/release/picobsd/doc/src/hardware.html index 2954695..f6f3e4e 100644 --- a/release/picobsd/doc/src/hardware.html +++ b/release/picobsd/doc/src/hardware.html @@ -1,5 +1,5 @@ <html> -<! $Id: hardware.html,v 1.1 1998/09/26 17:23:01 abial Exp $ > +<! $Id: hardware.html,v 1.2.2.1 1999/02/21 22:04:54 abial Exp $ > <body> <h1><center>Lists of supported hardware configurations.</center></h1> @@ -68,7 +68,7 @@ traceroute <li>support for several types of Ethernet cards (two of each kind) - see above for descriptions: ed, ie, ep, de, fxp, lnc </li> -<li>network daemons: routing daemon (routed), inetd, telnetd, snmpd. +<li>network daemons: routing daemon (routed), inetd, telnetd. </li> <li>IP Firewall and NAT daemon (natd). </li> diff --git a/release/picobsd/doc/src/how2build.html b/release/picobsd/doc/src/how2build.html index 7225603..5d08037 100644 --- a/release/picobsd/doc/src/how2build.html +++ b/release/picobsd/doc/src/how2build.html @@ -1,5 +1,5 @@ <html> -<! $Id: how2build.html,v 1.3 1998/10/28 16:16:31 abial Exp $ > +<! $Id: how2build.html,v 1.4.2.1 1999/05/07 10:02:49 abial Exp $ > <head> <title><center>PicoBSD Development Kit</center></title> </head> @@ -10,21 +10,18 @@ <ol> <li> - Get the file <code>picobsd.tgz</code>. It contains the scripts - you'll need. Also, I assume you run quite -current system with - full sources installed. - -<p> NOTE1: beginning with version 0.4, PicoBSD sources are maintained as - part of official FreeBSD CVS repository, so if you have recent - source tree you can find them in /src/release/picobsd.</p> - -<p> NOTE2: there were some mysterious interactions between vn(4) driver and - 'disklabel auto' in versions earlier than 3.0. There is another set - of scripts prepared by <A HREF="mailto:dinesh@alphaque.com">Dinesh Nair - </a> which allows to build PicoBSD floppies on a earlier systems.</p> - -<p> Unpack the archive into your <code>src/release/picobsd</code>. - You'll need at least 5MB of free space.</p> +<p> Beginning with version 0.4, PicoBSD sources are maintained as + part of official FreeBSD CVS repository, so + you can find them in src/release/picobsd.</p> +</li> +<li> + Become root. You'll need to mount and unmount various volumes. +</li> +<li> + Make sure you are running kernel with support for vn(4) devices. + If you run plain GENERIC (just as it was installed on your system), + you'll need to recompile you kernel and reinstall it. See the + appropriate entries in The Handbook (/usr/share/doc/handbook). </li> <li> Change working directory (<code>cd build</code>) and run the <code>./build</code> script. Select target language, size of MFS and @@ -113,7 +110,7 @@ <li> Make sure that the system you're running has /dev/[r]vn0* entries in /dev directory (if not, you can make them with 'MAKEDEV vn0'), AND that your running kernel has built-in vnode driver (there should be a - line in your kernel config file stating 'pseudo-device vn'). + line in your kernel config file stating 'pseudo-device vn xxx'). </li> <li> You'll need at least 9MB of free disk space, and free /mnt directory. </li> @@ -163,6 +160,12 @@ after <code>stage1</code> script ends). </li> </ul> +<li> the build process displays "Preparing MFS" and then + silently stops. In this case check if you're running it as + root, and that you run kernel with support for vn(4) + devices. Also, you can add 'set -x' at hte beginning + of the scripts to see exactly where they stop. +</li> </ul> You can also remove <code>2>&1</code> redirections from Makefiles diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf index 390e391..ac6b2ec 100644 --- a/release/picobsd/isp/crunch1/crunch.conf +++ b/release/picobsd/isp/crunch1/crunch.conf @@ -1,22 +1,9 @@ # -# $Id: crunch.conf,v 1.5 1999/01/19 23:10:34 abial Exp $ +# $Id: crunch.conf,v 1.5.2.2 1999/05/07 10:02:57 abial Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there -# sources for kget & vm -srcdirs ../../tinyware -# sources for ucd-snmp - they must be already patched & configured! -# The necessary steps are given below: -# * you have to comment out the line with 'CONFIGURE_ARGS' in -# /usr/ports/net/ucd-snmp/Makefile - otherwise you'll end up with -# shared libsnmp library, and we want a static one. -# * you have to symlink subdirectory agent -> snmpd -# * you have to properly construct an OBJS variable in snmpd/Makefile: -# OBJS=${MIBOBJS} ${AGENTOBJS} -# * we install a special version of MIB files - stripped of comments and -# descriptions. These MIBs are included here to save you the stripping. -#srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5 # other sources srcdirs /usr/src/bin srcdirs /usr/src/sbin/i386 @@ -25,15 +12,16 @@ srcdirs /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec +# sources for ns & vm +srcdirs ../../tinyware -progs ash test echo hostname ln login getty +progs sh test echo hostname ln login getty 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 progs mount mount_msdos umount comcontrol progs kill mount_std natd -#progs snmpd progs pwd pppd telnet more progs passwd date @@ -42,20 +30,15 @@ progs mount_cd9660 mount_nfs ping traceroute routed ipfw ln mount_cd9660 cd9660 ln mount_nfs nfs ln test [ -ln ash -sh -ln ash sh +ln sh -sh #ln newfs mount_mfs ln chown chgrp -# XXX Why? Some bug in crunchgen? -#ln newfs mfs ln mount_msdos msdos ln mount_std procfs ln mount_std mount_procfs ln msg dmesg ln ns netstat -# For snmpd -#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5/snmplib/libsnmp.a libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm -libs -lmytinfo -lipx -lz -lpcap -lalias +libs -lmytinfo -lipx -lz -lpcap -lalias -lwrap libs -ltermcap -lgnuregex -ltelnet -lcurses diff --git a/release/picobsd/isp/lang/README.en b/release/picobsd/isp/lang/README.en index d1dc2dc..3f4128d 100644 --- a/release/picobsd/isp/lang/README.en +++ b/release/picobsd/isp/lang/README.en @@ -1,4 +1,4 @@ -1998.07.20, Warsaw, Poland +1999.04.20, Warsaw, Poland PicoBSD @VER@ ----------- @@ -25,6 +25,10 @@ What are minimal requirements? two PPP connections (tun interfaces). So you can easily build something like router with as many as 6 outlets :-) +If you want to build a NAT (a.k.a. masquerading) router for your local +network, it's often enough if you run 'ppp -alias' on your serial line. +However, if you use ethernet cards, you should use combination of natd(8) +and ipfw(8). See the documentation on your full FreeBSD system. I'll be glad hearing from you about your experiences with PicoBSD. Thanks. diff --git a/release/picobsd/isp/lang/update.en b/release/picobsd/isp/lang/update.en index a821d4c..0f751e9 100755 --- a/release/picobsd/isp/lang/update.en +++ b/release/picobsd/isp/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:03:03 abial Exp $ pwd=`pwd` echo -n "Updating /etc contents on startup floppy... " mount /dev/fd0a /start_floppy @@ -17,7 +17,7 @@ cp -Rp . /start_floppy/etc/ pwd_mkdb master.passwd 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/isp/lang/update.pl b/release/picobsd/isp/lang/update.pl index 1b2c523..e55ef89 100755 --- a/release/picobsd/isp/lang/update.pl +++ b/release/picobsd/isp/lang/update.pl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: update.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +# $Id: update.pl,v 1.2.2.1 1999/05/07 10:03:04 abial Exp $ pwd=`pwd` echo -n "Uaktualniam katalog /etc na dyskietce... " mount /dev/fd0a /start_floppy @@ -17,7 +17,7 @@ cp -Rp . /start_floppy/etc/ pwd_mkdb master.passwd echo " Zrobione." echo -n "Uaktualniam parametry jadra..." -kget /start_floppy/kernel.config +kget /start_floppy/boot/kernel.conf umount /dev/fd0a cd ${pwd} echo " Zrobione." diff --git a/release/picobsd/isp/mfs.tree/Makefile b/release/picobsd/isp/mfs.tree/Makefile index 40bffa4..010abc5 100644 --- a/release/picobsd/isp/mfs.tree/Makefile +++ b/release/picobsd/isp/mfs.tree/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1998/09/20 00:46:25 abial Exp $ +# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:05 abial Exp $ # DESTDIR?=/mnt @@ -40,3 +40,4 @@ devnodes: tree rm MAKEDEV) clean: + diff --git a/release/picobsd/router/lang/update.en b/release/picobsd/router/lang/update.en index 894f70b..f69de8c 100755 --- a/release/picobsd/router/lang/update.en +++ b/release/picobsd/router/lang/update.en @@ -1,10 +1,10 @@ -# $Id: update.en,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +# $Id: update.en,v 1.2.2.1 1999/05/07 10:03:37 abial Exp $ echo -n "Updating /etc contents on startup floppy... " mount /dev/fd0a /start_floppy 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 echo " Done." diff --git a/release/picobsd/router/lang/update.pl b/release/picobsd/router/lang/update.pl index c4ad1c6..99fd5c9 100755 --- a/release/picobsd/router/lang/update.pl +++ b/release/picobsd/router/lang/update.pl @@ -1,11 +1,11 @@ #!/bin/sh -# $Id: update.pl,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +# $Id: update.pl,v 1.2.2.1 1999/05/07 10:03:38 abial Exp $ echo -n "Uaktualniam katalog /etc na dyskietce... " mount /dev/fd0a /start_floppy cd /etc cp -Rp . /start_floppy/etc/ echo " Zrobione." echo -n "Uaktualniam parametry jadra..." -kget /start_floppy/kernel.config +kget /start_floppy/boot/kernel.conf umount /dev/fd0a echo " Zrobione." diff --git a/release/picobsd/router/mfs.tree/Makefile b/release/picobsd/router/mfs.tree/Makefile index e7e8e91..620c604 100644 --- a/release/picobsd/router/mfs.tree/Makefile +++ b/release/picobsd/router/mfs.tree/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1998/09/20 00:46:27 abial Exp $ +# $Id: Makefile,v 1.2.2.1 1999/05/09 22:04:09 abial Exp $ # DESTDIR?=/mnt @@ -33,7 +33,7 @@ links: tree # We don't do it under 'all' because it's needed only on non-DEVFS systems devnodes: tree (cd ${DESTDIR}/dev; \ - ln -s MAKEDEV; \ + ln -s /dev/MAKEDEV; \ ./MAKEDEV std tun2 vty3 fd0 pty0 cuaa0 cuaa1 cuaa2; \ rm MAKEDEV) diff --git a/release/picobsd/tools/daemon/daemon.c b/release/picobsd/tools/daemon/daemon.c index 29a8d2a..5066dd8 100644 --- a/release/picobsd/tools/daemon/daemon.c +++ b/release/picobsd/tools/daemon/daemon.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: daemon.c,v 1.1.1.1 1998/07/14 07:30:40 abial Exp $ + * $Id: daemon.c,v 1.1.1.1.2.1 1999/02/05 12:21:57 abial Exp $ */ @@ -38,7 +38,7 @@ char *logo[]={ " [32m__ [31m\\~/[37m\n", " [32m-->=[41m===[40m[31m\\[37m\n", " [32m~~[37m [31md d[37m\n", -" [35mpico[37m\n", +" [35mpicoBSD[37m\n", NULL}; diff --git a/release/picobsd/tools/daemon/logo b/release/picobsd/tools/daemon/logo index 311dd5c..7c21cab 100644 --- a/release/picobsd/tools/daemon/logo +++ b/release/picobsd/tools/daemon/logo @@ -3,4 +3,4 @@ [32m__ [31m\~/[37m [32m-->=[41m===[40m[31m\[37m [32m~~[37m [31md d[37m - [35mpico[37m + [35mpicoBSD[37m |
