diff options
Diffstat (limited to 'release/picobsd')
127 files changed, 2172 insertions, 1747 deletions
diff --git a/release/picobsd/Version b/release/picobsd/Version index c9e1c0cbd01a3..b9153dca573bb 100644 --- a/release/picobsd/Version +++ b/release/picobsd/Version @@ -1 +1 @@ -VER=0.43 +VER=0.42 diff --git a/release/picobsd/build/build b/release/picobsd/build/build index 58d347c942014..786ee283f35d9 100755 --- a/release/picobsd/build/build +++ b/release/picobsd/build/build @@ -1,22 +1,26 @@ #!/bin/sh - # -# $Id: build,v 1.11 1999/01/14 23:14:45 abial Exp $ +# $Id: build,v 1.9 1998/09/22 15:40:00 abial Exp $ # # You can set the SRC variable which points to your source tree. It's # /usr/src by default (most people shouldn't change it). SRC=/usr/src + +# Set this if your crunchgen and kzip don't support ELF. +#OBJFORMAT=aout; export OBJFORMAT + # Default MFS sizes for different types of the floppy. Again, most people # shouldn't change them unless they know what they are doing. DIAL_DFLT_SIZE=1600 ROUTER_DFLT_SIZE=820 -NET_DFLT_SIZE=1700 -ISP_DFLT_SIZE=1700 +NET_DFLT_SIZE=2200 +ISP_DFLT_SIZE=2200 -# DEVFS is currently broken. Always set this. +# SET THIS if you're not using DEVFS # NO_DEVFS=yes diff --git a/release/picobsd/build/populate b/release/picobsd/build/populate index 06abaae29bb13..82f3646c1722b 100755 --- a/release/picobsd/build/populate +++ b/release/picobsd/build/populate @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: populate,v 1.7 1999/01/14 23:14:46 abial Exp $ +# $Id: populate,v 1.5 1998/09/19 21:44:42 abial Exp $ # . ../Version @@ -53,8 +53,8 @@ then cp help.a /mnt/help.a) elif [ "${TYPE}" != "router" ] then - #cp ../../build/kvm_kernel.db /mnt/var/db/kvm_kernel.db - #rm ../../build/kvm_kernel.db + cp ../../build/kvm_kernel.db /mnt/var/db/kvm_kernel.db + rm ../../build/kvm_kernel.db fi echo "-> Making and installing crunch1..." @@ -74,4 +74,12 @@ if [ ! -f ../tools/dumpnlist/dumpnlist ] then (cd ../tools/dumpnlist; make) fi +../tools/dumpnlist/dumpnlist ./kernel >/mnt/stand/symbols + +echo "-> Preparing kernel config list..." +if [ ! -f ../tinyware/kget/kget ] +then + (cd ../tinyware/kget; make) +fi +../tinyware/kget/kget ./kernel /mnt/stand/vanilla (echo "-> Fixing permissions"; cd /mnt; chown -R root *) diff --git a/release/picobsd/build/stage1 b/release/picobsd/build/stage1 index c4159eb0dfead..9846dd0ee22b8 100755 --- a/release/picobsd/build/stage1 +++ b/release/picobsd/build/stage1 @@ -1,7 +1,7 @@ #! /bin/sh - # -# $Id: stage1,v 1.6 1999/01/14 23:14:46 abial Exp $ +# $Id: stage1,v 1.3 1998/09/11 13:14:25 abial Exp $ # set -e @@ -13,14 +13,14 @@ fi echo "-> Preparing kernel..." cp -p ${SRC}/sys/compile/PICOBSD${suffix}.${SIZE}/kernel kernel -#if [ "${TYPE}" != "dial" ] -#then -# echo "-> Preparing kvm database..." -# mv /var/db/kvm_kernel.db /var/db/old.db -# kvm_mkdb kernel -# cp /var/db/kvm_kernel.db kvm_kernel.db -# mv /var/db/old.db /var/db/kvm_kernel.db -#fi +if [ "${TYPE}" != "dial" ] +then + echo "-> Preparing kvm database..." + mv /var/db/kvm_kernel.db /var/db/old.db + kvm_mkdb kernel + cp /var/db/kvm_kernel.db kvm_kernel.db + mv /var/db/old.db /var/db/kvm_kernel.db +fi echo "-> Preparing MFS filesystem..." umount /dev/vn0 2> /dev/null || true @@ -50,12 +50,7 @@ if [ "${TYPE}" != "router" ] then disklabel -rw vn0 auto else - if [ ${SIZE} -lt 1024 ] - then - disklabel -rw /dev/rvn0 fd${SIZE} - else - disklabel -rw vn0 auto - fi + disklabel -rw /dev/rvn0 fd820 fi if [ "X$?" != "X0" ] then @@ -65,7 +60,7 @@ then fi # Default setting for other (custom) setups. -INODES=4096 +INODES=16000 # You can save some space on MFS if you don't want so many inodes... if [ "${TYPE}" = "dial" ] then diff --git a/release/picobsd/build/stage2 b/release/picobsd/build/stage2 index 9354aadb1e83a..d5f70a7aa33f4 100755 --- a/release/picobsd/build/stage2 +++ b/release/picobsd/build/stage2 @@ -1,7 +1,7 @@ #! /bin/sh - # -# $Id: stage2,v 1.2 1998/09/07 06:46:25 abial Exp $ +# $Id: stage2,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ # set -e @@ -21,7 +21,6 @@ if [ ! -f ../tools/write_mfs_in_kernel/wmik ]; then fi ../tools/write_mfs_in_kernel/wmik kernel fs.PICOBSD -strip kernel -strip --remove-section=.note --remove-section=.comment kernel -gzip -9 -n kernel +kzip -v kernel rm fs.PICOBSD +rm kernel diff --git a/release/picobsd/build/stage3 b/release/picobsd/build/stage3 index 34b729dc95fd4..04b1db384f315 100755 --- a/release/picobsd/build/stage3 +++ b/release/picobsd/build/stage3 @@ -1,14 +1,14 @@ #! /bin/sh - # -# $Id: stage3,v 1.3 1998/09/26 17:27:18 abial Exp $ +# $Id: stage3,v 1.2 1998/08/31 13:35:06 abial Exp $ # set -e . ../Version -if [ ! -f kernel.gz ]; then - echo "-> ERROR: you must build kernel.gz first" +if [ ! -f kernel.kz ]; then + echo "-> ERROR: you must build kernel.kz first" exit 1 fi @@ -86,23 +86,15 @@ then fi cd ${pwd} -cp kernel.gz /mnt/kernel.gz +cp kernel.kz /mnt/kernel if [ "X$?" != "X0" ] then - echo "-> ERROR while transferring kernel.gz to /mnt..." + echo "-> ERROR while transferring kernel.kz to /mnt..." echo "-> Aborting $0" exit 10 fi -mkdir /mnt/boot -cp /boot/loader . -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 "-> Fixing permissions"; cd /mnt; chown -R root *) -rm kernel.gz +rm kernel.kz df -ik /mnt diff --git a/release/picobsd/dial/conf/Makefile b/release/picobsd/dial/conf/Makefile index 4be01f8f414e9..7fd4743f647f4 100644 --- a/release/picobsd/dial/conf/Makefile +++ b/release/picobsd/dial/conf/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1998/10/15 21:39:58 abial Exp $ +# $Id: Makefile,v 1.2 1998/09/29 12:12:31 abial Exp $ # SRC?=/usr/src @@ -17,5 +17,5 @@ $(KERNFILE): PICOBSD (cd ${CONF}; \ config ${CONFFILE}; \ cd ${COMPILE}; \ - make depend all) + make depend && make) diff --git a/release/picobsd/dial/conf/PICOBSD b/release/picobsd/dial/conf/PICOBSD index 4be43f626c36c..5886e30bfe1ad 100644 --- a/release/picobsd/dial/conf/PICOBSD +++ b/release/picobsd/dial/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.4 1998/11/14 20:10:15 abial Exp $ +# $Id: PICOBSD,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ # machine "i386" cpu "I386_CPU" @@ -12,7 +12,6 @@ maxusers 3 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT options MFS options MSDOSFS #MSDOS Filesystem options "CD9660" #ISO 9660 Filesystem @@ -20,7 +19,7 @@ options "EXT2FS" options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor options VISUAL_USERCONFIG #visual boot -c editor -options INTRO_USERCONFIG #imply -c and parse info area +options USERCONFIG_BOOT #imply -c and parse info area #options DEVFS options PCI_QUIET options NO_SWAPPING @@ -31,16 +30,16 @@ config kernel root on fd0 controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fdc0 drive 0 disk fd1 at fdc0 drive 1 options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port "IO_WD1" bio irq 14 vector wdintr disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 @@ -49,20 +48,16 @@ options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM # syscons is the default console driver, resembling an SCO console +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 -device psm0 at isa? tty irq 12 -device vga0 at isa? port ? conflicts -device sc0 at isa? tty +device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -device npx0 at isa? port IO_NPX irq 13 - -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 +device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr +device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr +device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr +device psm0 at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. @@ -72,11 +67,16 @@ device de0 #device de1 device fxp0 -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ep0 at isa? port 0x300 net irq 10 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device lnc0 at isa? port 0x300 net irq 10 +device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr +#device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 vector edintr +device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr +device ep0 at isa? port 0x300 net irq 10 vector epintr +#device ex0 at isa? port? net irq? vector exintr +#device fe0 at isa? port 0x300 net irq ? vector feintr +device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr +device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr +#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr pseudo-device loop pseudo-device ether diff --git a/release/picobsd/dial/crunch1/Makefile b/release/picobsd/dial/crunch1/Makefile index c47bae8d53275..93b6d78b373e8 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.1.1.1 1998/08/27 17:38:42 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} -f crunch1.mk all NOCRYPT=${NOCRYPT} \ "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 3558ddd0a7610..f516b752531c8 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.1.1.1 1998/08/27 17:38:42 abial Exp $ # # NOTE1: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there @@ -11,9 +11,9 @@ # * You have to configure and build the port # * Then you have to make a symlink: # cd /usr/ports/security/ssh/work/ -# ln -s ssh-1.2.26 ssh +# ln -s ssh-1.2.21 ssh # * Then you have to add OBJS=${SSH_OBJS} in the Makefile (somewhere around -# line 327) +# line 290) srcdirs /usr/ports/security/ssh/work/ # ash, kget etc... @@ -33,7 +33,7 @@ ln gzip gunzip ln gzip zcat ln gzip gzcat -progs ash test kget echo pwd msg stty +progs ash test kget echo pwd progs hostname cat kill sps vm ns progs chmod chown help progs cp df fsck ping mv ln traceroute @@ -45,7 +45,6 @@ ln ash sh ln ash -sh ln test [ ln sps ps -ln msg dmesg ln ns netstat ln mount_msdos msdos ln mount_cd9660 cd9660 diff --git a/release/picobsd/dial/floppy.tree/etc/login.conf b/release/picobsd/dial/floppy.tree/etc/login.conf index 9361a33c2f9e9..97ea6e8b700f0 100644 --- a/release/picobsd/dial/floppy.tree/etc/login.conf +++ b/release/picobsd/dial/floppy.tree/etc/login.conf @@ -1,7 +1,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:41 abial Exp $ # @@ -45,7 +45,7 @@ standard:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ :path=~/bin /bin /usr/bin:\ - :nologin=/var/run/nologin:\ + :nologin=/etc/nologin:\ :cputime=1h30m:\ :datasize=8M:\ :stacksize=2M:\ diff --git a/release/picobsd/dial/floppy.tree/etc/rc.network b/release/picobsd/dial/floppy.tree/etc/rc.network new file mode 100644 index 0000000000000..690f32a5387fa --- /dev/null +++ b/release/picobsd/dial/floppy.tree/etc/rc.network @@ -0,0 +1,70 @@ +#!/bin/sh - +# $Id: rc.network.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +network_pass1() { + echo -n 'Wstepna konfiguracja sieci:' + # Set the host name if it is not already set + if [ -z "`hostname -s`" ] ; then + hostname $hostname + echo ' hostname' + fi + # Set up all the network interfaces, calling startup scripts if needed + for ifn in ${network_interfaces}; do + if [ -e /etc/start_if.${ifn} ]; then + . /etc/start_if.${ifn} + fi + # Do the primary ifconfig if specified + eval ifconfig_args=\$ifconfig_${ifn} + if [ -n "${ifconfig_args}" ] ; then + ifconfig ${ifn} ${ifconfig_args} + fi + # Check to see if aliases need to be added + alias=0 + while : + do + eval ifconfig_args=\$ifconfig_${ifn}_alias${alias} + if [ -n "${ifconfig_args}" ]; then + ifconfig ${ifn} ${ifconfig_args} alias + alias=`expr ${alias} + 1` + else + break; + fi + done + ifconfig ${ifn} + done + # Configure routing + if [ "x$defaultrouter" != "xNO" ] ; then + static_routes="default ${static_routes}" + route_default="default ${defaultrouter}" + fi + # Set up any static routes. This should be done before router discovery. + if [ "x${static_routes}" != "x" ]; then + for i in ${static_routes}; do + eval route_args=\$route_${i} + route add ${route_args} + done + fi + echo -n 'Dodatkowe opcje routingu:' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp_extensions=NO' + sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 + sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 + fi + if [ "X$gateway_enable" = X"YES" ]; then + echo -n ' IP_gateway=YES' + sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 + fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' wlaczam ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + network_pass1_done=YES # Let future generations know we made it. +} + +network_pass2() { + network_pass2_done=YES +} + +network_pass3() { + network_pass3_done=YES +} diff --git a/release/picobsd/dial/floppy.tree/etc/resolv.conf b/release/picobsd/dial/floppy.tree/etc/resolv.conf new file mode 100644 index 0000000000000..d273c3bcec6f3 --- /dev/null +++ b/release/picobsd/dial/floppy.tree/etc/resolv.conf @@ -0,0 +1,3 @@ +# $Id: resolv.conf.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +domain mydomain.org.pl +nameserver 194.204.159.1 diff --git a/release/picobsd/dial/floppy.tree/etc/services b/release/picobsd/dial/floppy.tree/etc/services index eec499fafec7c..817b6d3152720 100644 --- a/release/picobsd/dial/floppy.tree/etc/services +++ b/release/picobsd/dial/floppy.tree/etc/services @@ -91,4 +91,3 @@ uucp 540/tcp uucp 540/udp uucp-rlogin 541/tcp uucp-rlogin 541/udp -natd 8668/divert # Network Address Translation diff --git a/release/picobsd/dial/lang/LICENCE.ssh b/release/picobsd/dial/lang/LICENCE.ssh index d5a0361e20f21..eb9023627723c 100644 --- a/release/picobsd/dial/lang/LICENCE.ssh +++ b/release/picobsd/dial/lang/LICENCE.ssh @@ -3,6 +3,6 @@ http://www.cs.hut.fi/ssh for details. In short, it permits non-commercial use only. Your usage may be further restricted by applicable local laws on using strong encryption methods. -<abial@freebsd.org> +<abial@nask.pl> -$Id: LICENCE.ssh,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +$Id: LICENCE.ssh,v 1.1.1.1 1998/07/14 07:30:41 abial Exp $ diff --git a/release/picobsd/dial/lang/README.en b/release/picobsd/dial/lang/README.en index 299c9406fb40d..4b2ffad4fbd12 100644 --- a/release/picobsd/dial/lang/README.en +++ b/release/picobsd/dial/lang/README.en @@ -101,6 +101,6 @@ I'll be glad hearing from you about your experiences with PicoBSD. Thanks. Have fun! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> -$Id: README.en,v 1.3 1998/10/15 21:40:00 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 bc31940c79b67..974ac81f81f77 100644 --- a/release/picobsd/dial/lang/README.pl +++ b/release/picobsd/dial/lang/README.pl @@ -102,6 +102,6 @@ Mo¿na tam znale¼æ trochê wiêcej informacji, oraz poprawki i nowe wersje. Mi³ej zabawy! -Andrzej Bia³ecki <abial@freebsd.org> +Andrzej Bia³ecki <abial@nask.pl> -$Id: README.pl,v 1.3 1998/10/15 21:40:00 abial Exp $ +$Id: README.pl,v 1.2 1998/09/26 17:27:19 abial Exp $ diff --git a/release/picobsd/dial/lang/boot.help.en b/release/picobsd/dial/lang/boot.help.en index 382222b618873..ecc3fa4653ddd 100644 --- a/release/picobsd/dial/lang/boot.help.en +++ b/release/picobsd/dial/lang/boot.help.en @@ -18,6 +18,6 @@ I hope you'll enjoy it. - abial@freebsd.org + abial@nask.pl +--------------------------------------------------------------------------+ diff --git a/release/picobsd/dial/lang/boot.help.pl b/release/picobsd/dial/lang/boot.help.pl index c52eb1191496d..0edf7ceeda59d 100644 --- a/release/picobsd/dial/lang/boot.help.pl +++ b/release/picobsd/dial/lang/boot.help.pl @@ -18,6 +18,6 @@ Milego uzywania. - abial@freebsd.org + abial@nask.pl +----------------------------------------------------------------------+ diff --git a/release/picobsd/dial/lang/dialup.en b/release/picobsd/dial/lang/dialup.en index 23b5d8ee8d980..918c6703ce961 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.3 1998/08/07 19:29:57 abial Exp $ set_resolv() { echo "[H[J" echo "[1m Default Domain Name[m" @@ -163,19 +163,7 @@ do echo "floppy!!! If you don't like it... well, you must dial in manually." echo "In that case abort this script (Ctrl-C). Otherwise, continue.[37m" echo "" - stty -echo read -p "Please enter your password: " pass - echo "" - read -p "Enter again your password: " pass1 - stty echo - echo "" - if [ "X${pass}" != "X${pass1}" ] - then - echo "Passwords didn't match! Press Enter to continue..." - read junk - pass="" - set_password - fi done } @@ -190,21 +178,22 @@ do echo "1) [32m......login:[37m ${user}" echo " [32m...password:[37m ********" echo " [36m(terminal server starts PPP here)[37m" + echo "" echo "2) [32m......login:[37m ${user}" echo " [32m...password:[37m ********" echo " [32m...protocol:[37m ppp" echo " [36m(terminal server starts PPP here)[37m" + echo "" echo "3) [32m......username:[37m ${user}" echo " [32m......password:[37m ********" echo " [36m(terminal server starts PPP here)[37m" + echo "" echo "4) [32m......username:[37m ${user}" echo " [32m......password:[37m ********" echo " [32mportX/..xxx...:[37m ppp" echo " [36m(terminal server starts PPP here)[37m" - echo "5) [32mUse CHAP to log in.[37m" - echo "6) [32mUse PAP to log in.[37m" echo "" - read -p "Choose 1,2,3,4,5 or 6: " chat + read -p "Choose 1,2,3 or 4: " chat case ${chat} in 1) chat1="TIMEOUT 10 ogin:--ogin: ${user} word: \\\\P" @@ -222,12 +211,6 @@ do chat1="TIMEOUT 10 ername:--ername: ${user} word: \\\\P port ppp" chat2="username/password/port" ;; - 5) chat1="-" - chat2="CHAP" - ;; - 6) chat1="-" - chat2="PAP" - ;; *) echo "Bad value! Please choose 1,2,3 or 4." echo "" unset chat @@ -338,12 +321,7 @@ echo " set speed ${speed}" >>/etc/ppp/ppp.conf echo " set phone ${phone}" >>/etc/ppp/ppp.conf echo " set authkey ${pass}" >>/etc/ppp/ppp.conf echo " set timeout ${timo}" >>/etc/ppp/ppp.conf -if [ "X${chat1}" = "-" ] -then - echo " set authname ${user}" >>/etc/ppp/ppp.conf -else - echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf -fi +echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf echo " set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0" >>/etc/ppp/ppp.conf echo " Done." @@ -366,30 +344,12 @@ echo "" echo "Now, if you're sure that your /etc/ppp/ppp.conf file is ok (which is" echo -n "probable :-) would you like to start the dialup connection now? (y/n) " read ans -opts="" while [ "X${ans}" = "Xy" ] do echo "[H[J" - if [ "X${opts}" = "X" ] - then - echo "We'll use the following arguments to 'ppp':" - echo "" - echo " ppp -background dialup" - echo " - echo -n "Would you like to change them? (y/n) " - read oo - if [ "X${oo}" = "Xy" ] - then - read -p "Enter ppp arguments here: " opts - else - opts="-background dialup" - fi - echo "" - echo "" - fi echo "Starting dialup connection. Wait until you see a 'PPP Enabled' message..." echo "" - ppp ${opts} + ppp -background dialup if [ "X$?" != "X0" ] then echo "" diff --git a/release/picobsd/dial/lang/dialup.pl b/release/picobsd/dial/lang/dialup.pl index 2d65e8441d937..3d7dcf508570d 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.4 1998/08/10 19:07:52 abial Exp $ set_resolv() { echo "[H[J" echo "[1m Domy¶lna Nazwa Domeny[m" @@ -162,19 +162,7 @@ do echo "rêcznie, tak jak dotychczas. W tym przypadku przerwij ten skrypt" echo "przez Ctrl-C.[37m" echo "" - stty -echo read -p "Podaj swoje has³o: " pass - echo "" - read -p "Podaj powtórnie swoje has³o: " pass1 - stty echo - echo "" - if [ "X${pass}" != "X${pass1}" ] - then - echo "Has³a nie pasuj± do siebie. Naci¶nij Enter..." - pass="" - read junk - set_pass - fi done } @@ -200,11 +188,7 @@ do echo " [32mportX/..xxx...:[37m ppp" echo " [36m(tutaj startuje PPP)[37m" echo "" - echo "4) [32mZastosuj CHAP[37m" - echo "" - echo "5) [32mZastosuj PAP[37m" - echo "" - read -p "Wybierz 1,2,3,4 lub 5: " chat + read -p "Wybierz 1,2 lub 3: " chat case ${chat} in 1) chat1="TIMEOUT 10 ogin:--ogin: ${user} word: \\\\P" @@ -218,12 +202,6 @@ do chat1="TIMEOUT 10 ername:--ername: ${user} word: \\\\P port ppp" chat2="NASK - username/password/port" ;; - 4) chat1="-" - chat2="CHAP" - ;; - 5) chat1="-" - chat2="PAP" - ;; *) echo "Z³a warto¶æ! Musisz wybraæ 1,2 lub 3." echo "" unset chat @@ -337,12 +315,7 @@ echo " set line /dev/cuaa${dev}" >>/etc/ppp/ppp.conf echo " set phone ${phone}" >>/etc/ppp/ppp.conf echo " set authkey ${pass}" >>/etc/ppp/ppp.conf echo " set timeout ${timo}" >>/etc/ppp/ppp.conf -if [ "X${chat1}" = "-" ] -then - echo "set authname ${user}" >>/etc/ppp/ppp.conf -else - echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf -fi +echo " set login \"${chat1}\"" >>/etc/ppp/ppp.conf echo " set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0" >>/etc/ppp/ppp.conf echo " Zrobione." @@ -366,27 +339,9 @@ echo "" echo "Ok. Je¶li Twój plik /etc/ppp/ppp.conf jest prawid³owy (co jest dosyæ" echo -n "prawdopodobne :-), czy chcesz teraz uruchomiæ po³±czenie dialup? (t/n) " read ans -opts="" while [ "X${ans}" = "Xt" ] do echo "[H[J" - if [ "X${opts}" = "X" ] - then - echo "Wystartujemy 'ppp' z poni¿szymi opcjami:" - echo "" - echo " ppp -background dialup" - echo " - echo -n "Czy chcesz je zmienic?? (t/n) " - read oo - if [ "X${oo}" = "Xt" ] - then - read -p "Podaj opcje ppp: " opts - else - opts="-background dialup" - fi - echo "" - echo "" - fi echo "Uruchamiam po³±czenie dialup. Proszê czekaæ dopóki nie pojawi siê" echo "komunikat 'PPP Enabled'..." echo "" diff --git a/release/picobsd/dial/lang/rc.en b/release/picobsd/dial/lang/rc.en index 8a0e806c1e02a..c64b446e9e3a4 100644 --- a/release/picobsd/dial/lang/rc.en +++ b/release/picobsd/dial/lang/rc.en @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.en,v 1.2 1998/09/26 17:27:19 abial Exp $ +# $Id: rc.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ ############################################ ### Special setup for one floppy PICOBSD ### ### THIS IS NOT THE NORMAL /etc/rc !!!!! ### @@ -97,7 +97,7 @@ echo '| BSD license (except for SSH). For more |' echo '| details see http://www.freebsd.org/~picobsd, |' echo '| or contact the author. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/dial/lang/rc.pl b/release/picobsd/dial/lang/rc.pl index 61dfd2f76b33e..8042a1c682434 100644 --- a/release/picobsd/dial/lang/rc.pl +++ b/release/picobsd/dial/lang/rc.pl @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: rc.pl,v 1.2 1998/09/26 17:27:19 abial Exp $ +# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ # ############################################ ### Special setup for one floppy PICOBSD ### @@ -101,7 +101,7 @@ echo '| SSH). Po wiecej szczegolow zajrzyj na |' echo '| http://www.freebsd.org/~picobsd, lub |' echo '| skontaktuj sie z autorem. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/dial/lang/update.en b/release/picobsd/dial/lang/update.en index 8fff72917e4cf..006e0ed4b2928 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.4 1998/08/10 19:07:53 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd ${pwd} echo " Done." diff --git a/release/picobsd/dial/lang/update.pl b/release/picobsd/dial/lang/update.pl index d462b9f84089c..97105d229aaf3 100755 --- a/release/picobsd/dial/lang/update.pl +++ b/release/picobsd/dial/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.4 1998/08/10 19:07:53 abial Exp $ pwd=`pwd` echo -n "Uaktualniam katalog /etc na dyskietce... " mount /dev/fd0a /start_floppy @@ -14,7 +14,7 @@ cd /etc cp -Rp . /start_floppy/etc/ echo " Zrobione." echo -n "Uaktualniam parametry j±dra..." -kget /start_floppy/kernel.config +kget -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd /etc cd ${pwd} diff --git a/release/picobsd/dial/mfs.tree/Makefile b/release/picobsd/dial/mfs.tree/Makefile index 44f3b75de1b9a..9c9ca2e361a09 100644 --- a/release/picobsd/dial/mfs.tree/Makefile +++ b/release/picobsd/dial/mfs.tree/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1998/09/22 15:41:05 abial Exp $ +# $Id: Makefile,v 1.3 1998/09/20 00:46:24 abial Exp $ # DESTDIR?=/mnt @@ -63,7 +63,6 @@ links: tree devnodes: tree (cd ${DESTDIR}/dev; \ /dev/MAKEDEV std sysmouse tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 pty0; \ - /dev/MAKEDEV psm0; \ /dev/MAKEDEV wd0s1h wd0s2 wd0s3 wd0s4 wd1s1h wd1s2 wd1s3 wd1s4) clean: diff --git a/release/picobsd/doc/src/Makefile b/release/picobsd/doc/src/Makefile index cbd065c8c21e5..6478cbfdc518b 100644 --- a/release/picobsd/doc/src/Makefile +++ b/release/picobsd/doc/src/Makefile @@ -1,17 +1,14 @@ # -# $Id: Makefile,v 1.1 1998/09/26 17:23:01 abial Exp $ +# $Id$ # .include "../../Version" -DATE!="date" - DOCS= bugs.html faq.html hardware.html how2build.html \ - intrinsics.html intro.html TODO.html + intrinsics.html intro.html all: ../../Version - for i in ${DOCS}; \ + for i in `ls *.html`; \ do \ - cat $${i}|sed -e 's/@VER@/${VER}/g' \ - -e 's/@DATE@/${DATE}/g' >../$${i}; \ + cat $${i}|sed -e 's/@VER@/${VER}/g' >../$${i}; \ done diff --git a/release/picobsd/doc/src/TODO.html b/release/picobsd/doc/src/TODO.html deleted file mode 100644 index 8192f02a0cb23..0000000000000 --- a/release/picobsd/doc/src/TODO.html +++ /dev/null @@ -1,154 +0,0 @@ -<html> -<! $Id: TODO.html,v 1.2 1998/12/22 21:40:56 abial Exp $ > -<body> -<h1><center> Small FreeBSD ToDo List. -</center></h1> - -<p>This list represents various tasks which are being collected from -discussions on freebsd-small, and which represent the general -direction and needs of using FreeBSD for small installations.</p> - -<p>The tasks are arranged by how important they are to the overall -idea and goals of the project. If you are interested in doing some -part of the work, please contact the coordinator of PicoBSD project -(<A HREF="mailto:abial@freebsd.org">Andrzej Bialecki</a>).</p> - -<hr> - -<h2>Short term tasks:</h2> - -<ul> -<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). -</li> -<li> -Provide options for building separate kernel and FS images of -various sizes. -</li> -<li> -Add some "wizards" to help people new to Unix configure "dialup" -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). -</li> -<li> -Add simple authentication module to oinit. -</li> -<li> -Fix kzip to be able to produce kzip'ped ELF kernels. -(NOTE: currently we work around it by using kzipped /boot/loader). -</li> -<li> -Write better documentation. This is very important - the most -common configurations should be described in detail, step by step. -</li> -<li> -Collect our experiences with using FreeBSD with SBCs, flash disks -etc, and write a short practical guide to embedding FreeBSD. -</li> -</ul> -<hr> - -<h2>Medium term tasks:</h2> - -<ul> -<li> -Change the building process so that it allows to easily choose -(with finer granularity) needed components of the target system. -</li> -<li> -Make use of recently added KLD to allow for easy adding and -removing drivers when running stripped kernels. -</li> -<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. -</li> -<li> -Provide options for building systems which operate from -(basically) read-only media, such as CD-ROM or flash disk. Such -system doesn't need to keep all root FS in memory, but only small -fraction of it for /tmp and /var. -</li> -<li> -Integrate DHCP into "dialup" version. -</li> -<li> -Rework oinit to be more modular, and write additional modules -(remote access, SNMP (?), authentication, shell(), configuration -editor). -</li> -<li> -Provide a remote access (telnetd/login/shell) module for the -"router" version. Make the shell() module more predictable and -compatible with common sense :-) -</li> -<li> -At last prepare usable version of ISP floppy, and test it (some -basic tests with server PPP). This involves among others a version -of PPP which supports Radius. -</li> -</ul> - -<hr> - -<h2>Long term tasks:</h2> - -<ul> -<li> -Either port ROMfs from Linux, or write our own replacement for it. -</li> -<li> -Describe the configuration tasks and parameters of PicoBSD systems -in terms of hierarchy of categories - this is needed to start -working on the next two points. -</li> -<li> -Design a flexible and efficient scheme (not necessarily compatible -with currently used set of shell scripts) for storing and editing -system configuration in some form of hierarchical DB. -</li> -<li> -Design a user interface for configuration of system parameters -and services, meeting the following requirements: hierachical, -logical, helpful (hinting), providing ability to automate certain -tasks. -</li> -<li> -Reduce memory footprint. -</li> -<li> -Add other language versions. -</li> -<li> -Throw some more effort in porting the newer version of W (graphical -UI), so that it uses VESA color modes. IMHO it's worth it. -</li> -</ul> - -<hr> - -<h2>Other half-baked ideas...</h2> - -<p>(fill this in :-)</p> - -<hr> -Last modified: -@DATE@ - - -<p><i>Send your comments, ideas, and most importantly the code itself, to -<A HREF="mailto:abial@freebsd.org">abial@freebsd.org</a>.</i></p> - -</body> -</html> diff --git a/release/picobsd/doc/src/UCI.html b/release/picobsd/doc/src/UCI.html deleted file mode 100644 index ae74b8489f827..0000000000000 --- a/release/picobsd/doc/src/UCI.html +++ /dev/null @@ -1,960 +0,0 @@ -<html> -<! $Id: UCI.html,v 1.2 1998/11/25 11:08:54 abial Exp $ > -<body> -<h1><center> Unified Configuration Interface Project -</center></h1> - -<p>The idea behind this project is to completely replace currently -used configuration approach, which is based on several shell scripts, and to -provide ability to change system behaviour basing on set of well-defined -parameters' hierarchy. One of the goals is also to provide an object -oriented model of the OS management and structure, instead of currently -used (inconsistent) procedural model of system/service startup/shutdown.</p> - -<p>This project involves such issues as: -<ul> -<li> -providing consistent view of the system and its functional subsystems as -a set of interrelated objects equipped with certain properties. -</li> -<li> -providing global approach to user interface, either command-line or with GUI -front-ends. -</li> -<li> -managing system resources and subsystems. This includes managing -static and dynamic interdependencies between subsystems, ability to -upgrade/downgrade specific subsystems on-the-fly. -</li> -</ul> -</p> - -<p><i><b>This is work in progress</b> - I'm aware that many pieces -are either completely missing or misplaced. Please send any comments and -changes you seem appropriate either directly to me, or better to -freebsd-small@freebsd.org. I'll gladly welcome anyone who can help with -design and/or implementation.</i></p> - - -<hr> - -<h1><center> Unified Configuration Interface -</center></h1> - -<ul> -<li> -<p>Let's first introduce the following terms: -<ul> -<li> -<b>management base</b> - the actual structure holding configuration and -information data according to defined structure. This structure will most -probably have a form of tree (possibly with cross-branch links or some other -mechanism representing mutual dependencies) - the way it's stored is -something which needs to be discussed. -</li> -<li> -<b>user interface</b> - a method (and agent) for presenting data stored in -management base in such a way that it can be viewed and modified by -legitimate users. -</li> -<li> -<b>system monitor</b> - an entity performing actual configuration and monitoring -tasks, from one side dealing with management base, and from the other -dealing with the system resources and subsystems, and from yet another dealing -either directly with the user (thus acting as a user interface), -or passing requests to other entity which acts as user interface. -</li> -<li> -<b>subsystem</b> - a package containing programs, configuration data, as well -as installing/deinstalling/start/stop stubs, which form together one logical -entity performing specific services on behalf of the system. Each subsystem -is viewed as an object with specific properties, dependencies, which is able -to generate events, service general requests common to all such subsystems, -and provide specific services to other subsystems. -</li> -</ul> -</li> -<li> -<p>One possible approach to storing the management data is to use already -existing framework known as MIB, as defined in applicable RFCs.</p> - -<p>This approach has several advantages: it represents well thought-out work -of many experienced individuals and teams, it has already proven to be -useful, it's widely used and accepted, it's easily extensible, it's able to -represent quite complicated objects, etc.</p> - -<p>It has some drawbacks, as well: e.g. there is no standard mechanism for -representing events and indirectly related objects, it tends to create -deep and narrow trees which require to descent several levels to change some -commonly used parameters, it doesn't say anything about the mutual -dependencies between objects and parameters (except parent-child-sibling), -and about required sequence to properly set their parameters, etc.</p> - -<p>These issues are not directly addressed in standards, and real -implementations (known to me) have to implement these additional mechanisms -"behind the scenes", so that their workings are not obvious nor easily -accessible (let alone changeable).</p> - -<p>So, if we decide to use it, we need to address these issues somehow. -The next point presents one possible approach to this dilemma.</p> -</li> -<li> -<p>The term "object" used in the following discussion represents a functional -subsystem, such as system service, usually performed by some specific -process (or, a set of global system parameters, in which case the system -monitor agent is the service itself). </p> - -<p>Each object represented in management base can be characterized by -following properties: -<ul> -<li> -its internal state, possibly consisting of several parameters and currently -performed functions, but represented to the rest of the system as a symbolic -state, one of set of states common to all objects. -</li> -<li> -a temporary space for new sets of parameters, which are being supplied by -other subsystems, prior to their actual application, -</li> -<li> -FSM definition, describing state transitions in reaction to received events, -</li> -<li> -list of events it can generate and accept, -</li> -<li> -list of dependencies on other objects' states and services, -</li> -<li> -list of requests it can handle, -</li> -<li> -list of parameters it can accept and/or provide, with their valid ranges. -</li> -</ul> -</p> - -<p>A few words on system startup: the system startup routines should ensure -that dependencies can be unwound into linear, ordered list. If it's not -possible, they should detect possible deadlocks at runtime, and act as an -arbiter between conflicting parties (or signal an error). In case of -unsatisfied dependency on some missing subsystem, the system monitor will -act appropriately as described below (in paragraph on request handling).</p> - -<p>The <b>set of symbolic states</b> may consist of the following states, -depicting object's current internal state (as described by its FSM): - -<center><table border> -<tr><th>Name</th><th>Meaning</th></tr> -<tr> -<td>INIT</td><td>the subsystem is initializing itself, possibly loading -necessary data and binaries from permanent storage.</td> -</tr> -<tr> -<td>CHECK</td><td>performing consistency check on newly supplied parameter values</td> -</tr> -<tr> -<td>READY</td><td>ready to start performing its primary function, but not started</td> -</tr> -<tr> -<td>START</td><td>start-up tasks (related to its primary function, as opposed -to INIT which is related to its own initialization)</td> -</tr> -<tr> -<td>STOP</td><td>stop (shutdown) tasks (when the object intends to stop -performing its function). This can involve unloading data and binaries from -main memory.</td> -</tr> -<tr> -<td>RUN</td><td>primary (work) phase</td> -</tr> -<tr> -<td>IDLE</td><td>waiting for some external event to happen</td> -</tr> -<tr> -<td>BUSY</td><td>the subsystem is busy (either with performing some -high-priority task, or just simply hung), and cannot be interrupted without -complete restart,</td> -</tr> -<tr> -<td>ERROR</td><td>this object is either improperly configured, or -malfunctioning</td> -</tr> -<tr> -<td>(other...)</td><td>(other...)</td> -</tr> -</table></center> -</p> - -<p>The <b>set of possible actions</b> may include the following actions:</p> - -<center><table border> -<tr><th>Name</th><th>Meaning</th></tr> -<tr> -<td>LIST_EV_REQ</td><td>get list of events the subsystem can generate</td> -</tr> -<tr> -<td>LIST_ACT_REQ</td><td>get list of actions the subsystem can respond to</td> -</tr> -<tr> -<td>GET_DEF_REQ</td><td>get definition of given parameter (the arguments, and -valid ranges)</td> -</tr> -<tr> -<td>SET_REQ</td><td>set given parameter to given value (this value will -be used only after COMMIT_REQ)</td> -</tr> -<tr> -<td>GET_REQ</td><td>get currently used value of given parameter</td> -</tr> -<tr> -<td>COMMIT_REQ</td><td>commit changes supplied in last transaction to currently -used set of parameters</td> -</tr> -<tr> -<td>ROLLBACK_REQ</td><td>revert last commit</td> -</tr> -<tr> -<td>INIT_REQ</td><td>perform initialization tasks</td> -</tr> -<tr> -<td>START_REQ</td><td>start performing primary function</td> -</tr> -<tr> -<td>STOP_REQ</td><td>stop performing primary function</td> -</tr> -<tr> -<td>RESTART_REQ</td><td>restart operation, possibly forcefully</td> -</tr> -<tr> -<td>NOTIFY_REQ</td><td>notify me of any changes in your state</td> -</tr> -<tr> -<td>CHECK_REQ</td><td>perform self-consistency check</td> -</tr> -<tr> -<td>UPGRADE_REQ</td><td>upgrade the subsystem - this possibly involves -downloading necessary pieces via network to permanent storage area. The -upgrade process should be transactional, and should save the older version -of the subsystem in case the DOWNGRADE_REQ should be issued.</td> -</tr> -<tr> -<td>DOWNGRADE_REQ</td><td>downgrade the subsystem - restore the previous -version of the subsystem from the copy on permanent storage.</td> -</tr> -<tr> -<td>UNINSTALL_REQ</td><td>uninstall the subsystem completely - possibly -freeing the space on permanent storage.</td> -</tr> -<tr> -<td>(other...)</td><td>(other...)</td> -</tr> -</table></center> -<p><i>(Each request includes source service identifier and credentials of -the sender)</i></p> - -<p>The <b>set of events</b> which can be generated by subsystems may include -the following:</p> - -<center><table border> -<tr><th>Name</th><th>Meaning</th></tr> -<tr> -<td>EV_ACK</td><td>positive acknowledge of the last operation</td> -</tr> -<tr> -<td>EV_NACK</td><td>negative acknowledge of the last operation</td> -</tr> -<tr> -<td>EV_CHANGE</td><td>change notification (includes the name of changed -parameter, and/or FSM state change)</td> -</tr> -<tr> -<td>EV_DEP</td><td>signal the dependency on another subsystem - ask for -existence of the service. Probably there should be two types of the dependency: -a soft one (where the subsystem can still function even if the dependency is -unresolved) and a hard one (when the existence and proper functioning of the -other subsystem is mandatory for its function).</td> -</tr> -<tr> -<td>(other...)</td><td>(other...)</td> -</tr> -</table></center> - -<p>One of event attributes can be a flag which says that this particular event -is a directed, or broadcast message. In case of directed message, it should -be forwarded only to interested parties. Broadcast message is sent to all -subsystems.</p> - -<p>System monitor agent will process these events and route them to -appropriate subsystems which are registered with it. Generally, if some -subsystem is dependent on some other, it will want to also receive all events -generated by the other subsystem.</p> - -<p>In case the subsystem -is missing, and the system monitor received events signalling that some other -subsystem is depending on it, the system monitor should arrange either for -installing necessary pieces from some media (be it permanent storage, or the -network), or to send an EV_NACK to the requesting subsystem. It's the -responsibility of the requesting subsystem to deal with such case -appropriately to the type of dependency (i.e. either "hard" or "soft"). - -<p>Ideally, the system monitor agent will be equipped with routines to -serialize the management data into human-readable form, so that it's easily -stored, backed up, and repaired in case of inconsistencies.</p> -</li> -<li> -<p>Actual user interface is still quite another story: I've seen UIs which -merely followed the standard MIBs, and menus were composed of actual OID -numbers plus DESCRIPTION field. In my experience, they are (barely) -acceptable, though due to the usual width and depth of MIB trees you had to -traverse several levels down and up in order to change some (protocol-wise) -related parameters.</p> - -<p>More acceptable UI would collect interrelated items under common menu -entries, irrespectibly of their actual position in the MIB tree.</p> - -<p>A worthwhile goal to pursue is to create such an UI which could guide -you through the most common configuration tasks, while at the same time -allowing for unrestricted and quick use by power users. This can be done -either as a set of configuration "wizards" or extensive hinting, command -completion, etc.</p> -</li> -<li> -<p>The management database should be easily exportable via standard -protocols, such as SNMP or LDAP.</p> - -<p>Most known to me (if not all) implementations of agents for these -protocols are (contrary to their name) quite heavy-weight - so their use -should be either optional, or replaced with some other light-weight -protocol and a proxy agent running on other machine. One example of -such proxy agent is existing UCD-SNMP implementation which in -significant part follows the sysctl(3) tree, merely exporting it as -a part of the MIB trees.</p> - -<p>It's worthwhile to consider also use of other protocols such as -DHCP (and BOOTP), Service Location Protocol (SLP - RFC2165) for easy -integration with LAN resources, easy initial configuration, and peer -discovery.</p> -</li> -<li> -<p>All operations performed by system monitor agent should be transactional, -i.e. it should be possible to commit a set of changes as one logical entity, -and be sure that either it's applied in whole, or not at all. This includes -also ability to abort processing in the middle.</p> - -<p>This probably means that each object (subsystem) should be able to store -not only its current configuration data, but also the newly supplied config -data that are to be applied after the transaction ends successfuly.</p> - -<p>Operations should be verified against allowed values, as well as against -allowed credentials, and basing on this either committed or aborted.</p> -</li> -<li> -<p>A few notes on possible implementation of system monitor:</p> -<ul> -<li> -let's assume that all configuration information is read on startup -by some specialized daemon (this can be part of init(8) as well), -which then performs role of communication agent through which passes -all configuration information, be it request for change, request -for info, request for start / shutdown, or notification about the change. -</li> -<li> -configuration information itself is stored either in binary database, or as -a filesystem hierachy mimicking configuration items hierarchy. -</li> -<li> -each user-level program performing some task (such as routing daemon, inetd -etc) is either equipped with the ability to communicate with config agent, or -is relinked with special stub which fakes to the program necessary config -files and events (such as signals to reread configuration). -<p>This probably means also that some libc routines would have to be replaced, -because they assume reading configuration from certain disk files.</p> - -<p>Since each such subsystem needs to implement some common actions such as -installing, deinstalling, start/stop etc, we could use already present -system of packages (with some minor modifications) to easily achieve -part of the goals (i.e. install/deinstall/upgrade/downgrade/stop/start).</p> -</li> -<li> -each subsystem performing some task requests its initial config data -from system monitor, at the same time registering with it to receive -configuration events, such as request to re-read data, to provide currently -used config data, return status, react for signals, restarts, etc... -</li> -<li> -system monitor acts as a meeting point for all producers and consumers -of events and config data. It needs to maintain a table of registered -subsystems, set of events they provide, set of events they want to receive, -etc.. Basing on this table, it routes appropriate information to -appropriate parties. -</li> -<li> -user interface is then just one of clients of system monitor, albeit possessing -special privileges. -</li> -<li> -one of important tasks of system monitor, in case given -object (subsystem) registers with it to be notified about certain events, is -to ensure that such type of event can be possibly generated. This is to -prevent subsystems from waiting for events coming from other non-existent -subsystems. See the discussion above on satisfying dependencies. -</li> -</ul> -<i><p>NOTE: this is one possible approach - a centralized one. It's worth to -consider other approach, distributed, in which case each object (subsystem) -sends and listens to the data at a meeting point specific to each other -object. This eliminates (or drastically minimizes) the role of system -monitor which is a single point of failure in centralized case.</p></i> -</li> -</ul> - -<hr> - -<p>Here is my initial proposal for the User Interface hierarchy:</p> - -<ul> -<li> -System configuration. - <ol> - <li> - Boot device and file <br> - <small>Name of the boot device (possibly networked) and boot - image.</small> - <ol> - <li> - (Enumeration of available devices) - <ol> - <li> - (Enumeration of available files) - </li> - </ol> - </li> - </ol> - </li> - <li> - Config file <br> - <small>Configuration file management - loading and saving, either - local or remote (if applicable). </small> - <ol> - <li> - Load / Save - <ol> - <li> - Source / Destination <br> - (Enumeration of available storage places, possibly - networked) - </li> - </ol> - </li> - <li> - Edit directly (geek mode) - </li> - </ol> - </li> - <li> - Subsystems <br> - <ol> - <li> - Module management <br> - <small>Optional hardware drivers and protocol modules - management.</small> - <ol> - <li> - (Enumeration of available loadable modules) - <ol> - <li> - Load / unload / status - </li> - </ol> - </li> - </ol> - </li> - <li> - Package management<br> - <small>Management of basic and optional system services.</small> - <ol> - <li> - (Enumeration of locally available packages) - <ol> - <li> - Start / Stop / Status / Configure - </li> - </ol> - </li> - </ol> - </li> - <li> - Default source of service packages<br> - <small>Where to automatically get the missing packages from. - </small> - <ol> - <li> - (Enumeration of available media) <br> - (local and remote disks, ftp, http) - </li> - </ol> - </li> - </ol> - </li> - <li> - Resource management - <ol> - <li> - Memory consumption <br> - <small>This is entry point to a subtree, which allows to set - up various resource limits for subsystems, services and - processes.</small> - </li> - <li> - Space consumption<br> - <small>(Things like minimal free space on permanent storage..) - </small> - </li> - <li> - Task priorities - <small>This includes not only currently running tasks, but all - which can possibly be started.</small> - <ol> - <li> - List / Modify - </li> - </ol> - </li> - </ol> - </li> - <li> - System console - </li> - <li> - Virtual consoles (if applicable) - </li> - <li> - System Date / Time Zone - </li> - <li> - Banner - </li> - <li> - Logging - <ol> - <li> - Local logging - </li> - <li> - Remote logging - </li> - </ol> - </li> - </ol> -</li> -<li> -Network configuration. - <ol> - <li> - Hostname and Domain - </li> - <li> - Interfaces - <ol> - <li> - (Enumeration of physical interfaces) <br> - (Enumeration of virtual interfaces, if applicable) <br> - (Options for creating virtual interfaces, if applicable) - <ol> - <li> - Interface options (speed, media, encapsulation, - description, etc.) - </li> - <li> - ARP - </li> - <li> - Bridging - </li> - <li> - IP - <ol> - <li> - Adress / netmask / alias - </li> - </ol> - </li> - <li> - IPX - </li> - <li> - AppleTalk - </li> - </ol> - </li> - </ol> - </li> - <li> - Protocol Options - <ol> - <li> - IP, UDP, TCP, ARP, IPX, ATM ... <br> - (Enumeration of available protocols) - <ol> - <li> - (Enumeration of protocol specific options, such as - buffer sizes, algorithms, ARP tables etc) - <ol> - <li> - List / Add / Delete / Modify / Set (where - applicable) - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - <li> - Routes - <ol> - <li> - List - </li> - <li> - Static - <ol> - <li> - Add / Delete / List - <ol> - <li> - (route expression) - </li> - </ol> - </li> - </ol> - </li> - <li> - Dynamic - <ol> - <li> - (Enumeration of available routing protocols) - <ol> - <li> - Add / Delete / List - <ol> - <li> - (route expression) - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - <li> - Network services - <ol> - <li> - DNS - <ol> - <li> - Hosts - <ol> - <li> - Add / Delete / List - <ol> - <li> - (hosts definitions) - </li> - </ol> - </li> - </ol> - </li> - <li> - Resolvers - <ol> - <li> - Add / Delete / List - <ol> - <li> - (hosts addresses) - </li> - </ol> - </li> - </ol> - </li> - <li> - Local DNS server config - </li> - </ol> - </li> - <li> - PPP - <ol> - <li> - Server - </li> - <li> - Client - </li> - </ol> - </li> - <li> - NFS - <ol> - <li> - Server - </li> - <li> - Client - </li> - </ol> - </li> - <li> - NIS - </li> - <li> - DHCP - <ol> - <li> - Add / Delete / Reserve / List - <ol> - <li> - (IP address expressions) - </li> - </ol> - </li> - </ol> - </li> - <li> - SNMP - <ol> - <li> - Protocol version - </li> - <li> - Send traps to... - </li> - <li> - Access Control Lists <br> - <small>(This is either full-blown ACL system in case - of SNMPv2, or a community string for SNMPv1.)</small> - </li> - </ol> - </li> - <li> - Printing - <ol> - <li> - Local / Remote - <ol> - <li> - Printers - <ol> - <li> - Add / Modify / Delete / List - </li> - </ol> - </li> - <li> - Queues - <ol> - <li> - Priority / Delete / List - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - <li> - SMB services - </li> - <li> - Network Address Translation - </li> - <li> - Packet filters - </li> - <li> - Bandwidth Manager - </li> - <li> - NTP - </li> - <li> - Remote Access - </li> - </ol> - </li> - </ol> -<li> -User management. - <ol> - <li> - User accounts - <ol> - <li> - Add / Delete / Modify / List - <ol> - <li> - Name / Password / ACL - </li> - </ol> - </li> - </ol> - </li> - <li> - User profiles - <ol> - <li> - Access Control Lists. - <ol> - <li> - Add / Delete / Modify / List - <ol> - <li> - Name / Template / Definition - </li> - </ol> - </li> - </ol> - </li> - <li> - ACL Templates - <ol> - <li> - Add / Delete / Modify / List - <ol> - <li> - Name - <ol> - <li> - Command restrictions list - </li> - <li> - Location restrictions list - </li> - <li> - Resources restrictions list - </li> - <li> - Time restrictions list - </li> - <li> - Authentication methods - <ol> - <li> - Unix passwd - </li> - <li> - S/Key - </li> - <li> - Kerberos - </li> - <li> - Radius - </li> - <li> - TACACS - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - </ol> - </li> - </ol> -</li> -<li> -Other services - <ol> - <li> - Cron tasks - </li> - </ol> -</li> -<li> -Filesystems. - <ol> - <li> - Local / Remote - <ol> - <li> - (Enumeration of available FS-s) - <ol> - <li> - FS / Mounting point / Options - </li> - </ol> - </li> - <li> - Swap Partition / Swap File - <ol> - <li> - Create / Turn on - </li> - </ol> - </ol> - </li> - </ol> -</li> -<li> -Environment - <ol> - <li> - Set / Unset / List - </li> - </ol> -</li> -<li> -System status - <ol> - <li> - (Enumeration of available status items) - </li> - </ol> -</li> -<li> -Diagnostics - <ol> - <li> - Debug - <ol> - <li> - (Enumeration of subsystems hierarchy, those of which can - provide debugging data) - <ol> - <li> - Set / Clear / Level - </li> - </ol> - </li> - </ol> - </li> - <li> - System messages - </li> - <li> - Ping / traceroute / rtquery - </li> - </ol> -</li> -</ul> - -<hr> -<i> -<p>Please send your comments to <A HREF="mailto:abial@freebsd.org"> -Andrzej Bialecki</a></p> -<p>Last modified: -@DATE@ -</p> -</i> - -</body> -</html> diff --git a/release/picobsd/doc/src/bugs.html b/release/picobsd/doc/src/bugs.html index 2eb29cee525d2..c878d00968316 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.3 1998/10/12 07:52:34 abial Exp $ > <HEAD> <TITLE>History and Bug fixes</TITLE> </HEAD> @@ -14,25 +14,9 @@ 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.43</h3> -<ul> -<li> - 1999.01.19: A lot of fixes related to architectural changes in - 3.0-current code. Most importantly, we run now ELF kernel and we use - the new bootloader. This is most probably the last release of PicoBSD in - its present shape - the next version will (hopefully) become a part of - normal release building process. -</li> -</ul> - <h3>PicoBSD 0.42</h3> <ul> <li> - 1999.01.15: Well, it seems that this version was for developers - only... ;-) It was abandoned when recent massive changes in -current - demanded more serious measures... -</li> -<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... @@ -134,12 +118,12 @@ the list before reporting a new one.</p> </ul> <h5>Last modified: -@DATE@ +Mon Oct 12 00:51:45 PDT 1998 </h5> <HR align="center" width="100%"> <CENTER><h5>Any comments? Send them to -<A HREF="mailto:abial@freebsd.org">the author</A> </h5></CENTER> +<A HREF="mailto:abial@nask.pl">the author</A> </h5></CENTER> </BODY> </HTML> diff --git a/release/picobsd/doc/src/faq.html b/release/picobsd/doc/src/faq.html index 1a86d587f67c8..c45b56e784779 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.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"> @@ -39,7 +39,7 @@ fully grown daemons, and PicoBSD as a system infested with <P>PicoBSD has versions based on FreeBSD 3.0-RELEASE, 3.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 +<A HREF="mailto:abial@nask.pl">Andrzej Bialecki</A> maintains the <A HREF="http://www.freebsd.org/~picobsd/picobsd.html">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 @@ -101,7 +101,7 @@ maintained by Dinesh Nair</LI> Additional mirror sites will be brought online as demand increases. If you're interested in mirroring the PicoBSD distribution, please get in touch with <A HREF="mailto:dinesh@alphaque.com">Dinesh Nair</A> or -<A HREF="mailto:abial@freebsd.org">Andrzej Bialecki</A>. +<A HREF="mailto:abial@nask.pl">Andrzej Bialecki</A>. <P><B>How do I copy it to the floppy?</B></p> @@ -241,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: -@DATE@ +Thu Oct 15 23:31:28 CEST 1998 </FONT></B></P> </BODY> </HTML> diff --git a/release/picobsd/doc/src/hardware.html b/release/picobsd/doc/src/hardware.html index 2954695f6481a..207508123e116 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.1.1.1 1998/08/27 17:38:42 abial Exp $ > <body> <h1><center>Lists of supported hardware configurations.</center></h1> @@ -103,10 +103,5 @@ you'll find it as a cheap yet reliable alternative to commercial communication servers :-)) This work is still in progress, and <A HREF="beta.html">I need some people to test</a> the early dial-in server version.</p> - -<hr> -<i>Last modified: -@DATE@ -</i> </body> </html> diff --git a/release/picobsd/doc/src/how2build.html b/release/picobsd/doc/src/how2build.html index 7225603a5039a..9a29f28bfcd14 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.1 1998/09/26 17:23:01 abial Exp $ > <head> <title><center>PicoBSD Development Kit</center></title> </head> @@ -184,10 +184,6 @@ <p>If, for some reason, the scripts don't work for you at all, also let me know.</p> -<hr> -<i>Last modified: -@DATE@ - -<p><A HREF="mailto:abial@freebsd.org"><abial@freebsd.org></a></i></p> +<A HREF="mailto:abial@nask.pl"><abial@nask.pl></a> </body> </html> diff --git a/release/picobsd/doc/src/intrinsics.html b/release/picobsd/doc/src/intrinsics.html index dc4ca55aba3cc..cac4703cbcbe2 100644 --- a/release/picobsd/doc/src/intrinsics.html +++ b/release/picobsd/doc/src/intrinsics.html @@ -1,5 +1,5 @@ <html> -<! $Id: intrinsics.html,v 1.1 1998/09/26 17:23:01 abial Exp $ > +<! $Id: intrinsics.html,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ > <head> <title><center>Details of building process</center></title> </head> @@ -122,5 +122,5 @@ the build process:</p> <h6> Last modified: -@DATE@ +Wed Aug 19 18:49:08 CEST 1998 </h6> diff --git a/release/picobsd/doc/src/intro.html b/release/picobsd/doc/src/intro.html index 0b69b6b7b6633..c69622be2d9a7 100644 --- a/release/picobsd/doc/src/intro.html +++ b/release/picobsd/doc/src/intro.html @@ -1,5 +1,5 @@ <HTML> -<! $Id: intro.html,v 1.5 1998/11/01 19:52:47 abial Exp $ > +<! $Id: intro.html,v 1.2 1998/09/26 17:39:21 abial Exp $ > <HEAD> <TITLE>PicoBSD</TITLE> </HEAD> @@ -9,6 +9,7 @@ <HR shade align="center" size="8" width="25%"></CENTER> +<IMG SRC="../../icons/daemon.gif" ALIGN="right"> <p><b>Contents:</b></p> <ul> <li> @@ -156,7 +157,7 @@ version 0.4 it's a part of official FreeBSD CVS and lives in <code>src/release/picobsd</code>. I also create the snapshots of this source tree - keep in mind that they are not so up-to-date as the tree in FreeBSD CVS. You can get the snapshot I made on -Sun Nov 1 11:48:32 PST 1998 +Mon Oct 12 00:53:02 PDT 1998 <A HREF="http://www.freebsd.org/~picobsd/picobsd/picobsd.tgz">here</a>.</p> <p> Now, if you don't like the setup of PicoBSD, or you miss @@ -215,15 +216,14 @@ imagination and coding skills:</p> <ul> <li> To write a command line tool patterned after Cisco IOS, which could configure -various aspects of router-like version of PicoBSD. -<p>Well, currently you can read very preliminary draft of proposed -architecture, called the <A HREF="UCI.html">Unified Configuration Interface.</a></p> +various aspects of router-like version of PicoBSD. I'm nowhere near with this +goal - I even don't have any good idea how to do it cleanly (I do have some +ideas, but I classify them as dirty hacks). </li> <li> To put an XWindow-like GUI on the 'dialup' floppy. (Update: you can look at <A HREF="http://www.freebsd.org/~picobsd/preview/preview2.tgz">preview -version</a> and send me your comments. <b>I need some help in porting newer -version of W</b>). +version</a> and send me your comments). </li> <li> To gain some experience with solid state disks, and prepare standard images @@ -247,23 +247,23 @@ to be able to run truely effortlessly on 4MB machines... This would probably include rewriting oinit(8) to run multithreaded. </li> <li> -And many others... You can find a complete list -<A HREF="TODO.html">here</a>. +And many others, too vague to put them here. <b>You</b> can also suggest me +some others applications/solutions you're dreaming of... </li> </ul> <A NAME="credits"><h3>Credits</h3> <p>The following people are either responsible for the very existence of this -project, or significantly eased my pains in gaining necessary knowledge:</p> +project, or significantly eased my pains of gaining necessary knowledge:</p> <ul> <li> the whole FreeBSD team for this magnificent OS, and their hard work of continuous development, </li> <li> -Dinesh Nair, for co-development and preparing of the version which compiled -on 2.2.5-RELEASE, +Dinesh Nair, for co-development and preparing of the version which compiles +on -RELEASE, </li> <li> Joe Greco, for his encouraging example of XKERNEL (some parts of the scripts @@ -292,15 +292,15 @@ guys! which allows you to use it in various ways, including commercial applications. So grab it and enjoy! And if you feel that you want to help with this project, either by donating some time to write code, or by -some other donation, just <A HREF="mailto:abial@freebsd.org">contact me</a>.</p> +some other donation, just <A HREF="mailto:abial@nask.pl">contact me</a>.</p> <h5>Last modified: -@DATE@ +Fri Sep 4 01:17:44 PDT 1998 </h5> <HR shade align="left" size="2" width="100%"> <CENTER><h5>Any comments? Send them to -<A HREF="mailto:abial@freebsd.org">the author</A> </h5></CENTER> +<A HREF="mailto:abial@nask.pl">the author</A> </h5></CENTER> </BODY> </HTML> diff --git a/release/picobsd/help/dmesg.hlp.en b/release/picobsd/help/dmesg.hlp.en deleted file mode 100644 index b55e690b2b5b3..0000000000000 --- a/release/picobsd/help/dmesg.hlp.en +++ /dev/null @@ -1,5 +0,0 @@ -[1mdmesg[m display kernel message buffer contents - - Usage: - - dmesg | more diff --git a/release/picobsd/help/dmesg.hlp.pl b/release/picobsd/help/dmesg.hlp.pl deleted file mode 100644 index 544c6ca49da3d..0000000000000 --- a/release/picobsd/help/dmesg.hlp.pl +++ /dev/null @@ -1,5 +0,0 @@ -[1mdmesg[m wy¶wietl zawarto¶æ bufora komunikatów - - Sposób u¿ycia: - - dmesg | more diff --git a/release/picobsd/help/help.hlp.en b/release/picobsd/help/help.hlp.en index b38db3d6c5525..dc35a4154edd6 100644 --- a/release/picobsd/help/help.hlp.en +++ b/release/picobsd/help/help.hlp.en @@ -3,5 +3,5 @@ This command displays short description of the commands included on PicoBSD floppy. When invoked with no argument, it displays this text :-). Any other argument is treated as a name of file located in - /help.a archive on the floppy, and this file is displayed page by + /help directory on the floppy, and this file is displayed page by page. diff --git a/release/picobsd/help/help.hlp.pl b/release/picobsd/help/help.hlp.pl index 47e039d0c847b..fa219d50185c3 100644 --- a/release/picobsd/help/help.hlp.pl +++ b/release/picobsd/help/help.hlp.pl @@ -3,5 +3,5 @@ To polecenie wyswietla krotka instrukcje obslugi programow na dyskietce. Uruchomione bez zadnego argumentu, wyswietla ten tekst. :-) Kazdy inny argument traktowany jest jak nazwa pliku znajdujacego sie - w archiwum /help.a, po czym zostaje wyswietlona zawartosc tego pliku + w katalogu /help, po czym zostaje wyswietlona zawartosc tego pliku strona po stronie. diff --git a/release/picobsd/help/vm.hlp.en b/release/picobsd/help/vm.hlp.en index 6a391c1b1956a..c707ca5cd9a3f 100644 --- a/release/picobsd/help/vm.hlp.en +++ b/release/picobsd/help/vm.hlp.en @@ -3,8 +3,8 @@ This program repeatedly displays current memory usage, showing the following numbers: - * procs: number of processes; r - running, w - waiting for I/O, - l - sleeping, s - swapping + * procs: number of processes; r - running, d - waiting for I/O, + p - paging, s - sleeping, * virt mem: virtual memory amounts (total and active), in kB * real mem: real memory amounts (total and active), in kB * shared vm: amount of shared virtual memory (total and active), in kB diff --git a/release/picobsd/help/vm.hlp.pl b/release/picobsd/help/vm.hlp.pl index 00b8509a92d37..b95d838ea02b4 100644 --- a/release/picobsd/help/vm.hlp.pl +++ b/release/picobsd/help/vm.hlp.pl @@ -4,9 +4,9 @@ wyswietlajac nastepujace wartosci: * procs: liczba procesow: r - running (dzialajace), - w - czekajace na I/O, - l - sleeping, - s - swapping, + d - czekajace na I/O, + p - paging, + s - sleeping, * virt mem: ilosc pamieci witrualnej (total i active), w kB * real mem: ilosc pamieci rzeczywistej (total i active) w kB * shared vm: ilosc dzielonej pamieci wirtualnej, w kB diff --git a/release/picobsd/isp/conf/Makefile b/release/picobsd/isp/conf/Makefile index af4b903f642e7..52a6b75c6e3b2 100644 --- a/release/picobsd/isp/conf/Makefile +++ b/release/picobsd/isp/conf/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1998/10/15 21:40:01 abial Exp $ +# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $ # SRC?=/usr/src @@ -17,5 +17,5 @@ $(KERNFILE): PICOBSD (cd ${CONF}; \ config ${CONFFILE}; \ cd ${COMPILE}; \ - make depend all) + make depend && make) diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD index 9f9c5dc12adc1..e1994e4e5522c 100644 --- a/release/picobsd/isp/conf/PICOBSD +++ b/release/picobsd/isp/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.7 1999/01/14 23:20:09 abial Exp $ +# $Id: PICOBSD,v 1.3 1998/09/19 21:44:57 abial Exp $ # machine "i386" @@ -13,7 +13,6 @@ maxusers 20 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT options NFS #Network Filesystem #options BOOTP options MFS @@ -22,7 +21,7 @@ options "CD9660" #ISO 9660 Filesystem options PROCFS #Process filesystem options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor -options INTRO_USERCONFIG #imply -c and parse info area +options USERCONFIG_BOOT #imply -c and parse info area options VISUAL_USERCONFIG #visual boot -c editor options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT @@ -39,16 +38,16 @@ config kernel root on fd0a controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port "IO_WD1" bio irq 14 vector wdintr disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 @@ -57,40 +56,36 @@ options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM # syscons is the default console driver, resembling an SCO console +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 -device vga0 at isa? port ? conflicts -device sc0 at isa? tty +device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -device npx0 at isa? port IO_NPX irq 13 - -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? port "IO_COM3" tty irq 5 -device sio3 at isa? port "IO_COM4" tty irq 9 +device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr +device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr +device sio2 at isa? port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? port "IO_COM4" tty irq 9 vector siointr # Support for multiport serial cards -options COM_MULTIPORT +options "COM_MULTIPORT" # AST device sio4 at isa? port 0x2a0 tty flags 0x701 device sio5 at isa? port 0x2a8 tty flags 0x701 device sio6 at isa? port 0x2b0 tty flags 0x701 -device sio7 at isa? port 0x2b8 tty flags 0x701 irq 12 +device sio7 at isa? port 0x2b8 tty flags 0x701 irq 12 vector siointr # Boca Board. You must configure the ports above with -c to change the flags. device sio8 at isa? port 0x120 tty flags 0xb05 device sio9 at isa? port 0x128 tty flags 0xb05 device sio10 at isa? port 0x130 tty flags 0xb05 -device sio11 at isa? port 0x138 tty flags 0xb05 irq 12 +device sio11 at isa? port 0x138 tty flags 0xb05 irq 12 vector siointr # Hayes ESP boards -options COM_ESP +options "COM_ESP" # Comtrol Rocketport # The PCI versions @@ -101,24 +96,30 @@ device rp0 at isa? port 0x100 tty device rp1 at isa? port 0x180 tty # Cyclades Cyclom-Y serial driver -device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 -device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 +device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 vector cyintr +device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 vector cyintr -device lpt0 at isa? port? tty irq 7 +device lpt0 at isa? port? tty irq 7 vector lptintr # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. device de0 +device de1 device fxp0 -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device lnc0 at isa? port 0x300 net irq 10 drq 0 +device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr +device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 vector edintr +device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr +device ep0 at isa? port 0x300 net irq 10 vector epintr +device ep1 at isa? port 0x280 net irq 5 vector epintr +#device ex0 at isa? port? net irq? vector exintr +#device fe0 at isa? port 0x300 net irq ? vector feintr +#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr +device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr +#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr pseudo-device loop pseudo-device ether diff --git a/release/picobsd/isp/crunch1/Makefile b/release/picobsd/isp/crunch1/Makefile index eeb626fad3597..a5c69e8af06d3 100644 --- a/release/picobsd/isp/crunch1/Makefile +++ b/release/picobsd/isp/crunch1/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.3 1998/10/15 21:40:01 abial Exp $ +# $Id: Makefile,v 1.2 1998/08/28 08:57:16 abial Exp $ # SRC?=/usr/src @@ -7,17 +7,21 @@ all: crunch crunch: @if [ ! -f .patched ]; then \ + cat login.diff|(cd /usr/src/usr.bin/login; patch -p0); \ cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \ + cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -p0); \ touch .patched; \ fi @cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf @crunchgen ./crunch1.conf - @${MAKE} -f crunch1.mk -DNOPAM all \ + @${MAKE} -f crunch1.mk all \ "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null clean: @if [ -f .patched ]; then \ + cat login.diff|(cd /usr/src/usr.bin/login; patch -R -p0); \ cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \ + cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -R -p0); \ rm .patched; \ fi rm -f *.o *.stub *.lo *_stub.c *.mk \ @@ -38,8 +42,8 @@ install: done rm /mnt/stand/crunch # Install the MIB files - #mkdir -p /mnt/usr/local/share/snmp/mibs - #cp ../../net/crunch1/mibs/*.txt /mnt/usr/local/share/snmp/mibs/ + mkdir -p /mnt/usr/local/share/snmp/mibs + cp ../../net/crunch1/mibs/*.txt /mnt/usr/local/share/snmp/mibs/ .include <bsd.prog.mk> diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf index 2c8e1035d1b84..7418d0b5d23a3 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.3 1998/09/15 07:35:31 abial Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there @@ -16,7 +16,7 @@ srcdirs ../../tinyware # 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 +srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5 # other sources srcdirs /usr/src/bin srcdirs /usr/src/sbin/i386 @@ -27,13 +27,12 @@ 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 snmpd natd 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 @@ -55,7 +54,7 @@ ln msg dmesg ln ns netstat # For snmpd -#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5/snmplib/libsnmp.a +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 -ltermcap -lgnuregex -ltelnet -lcurses diff --git a/release/picobsd/isp/floppy.tree/etc/hosts b/release/picobsd/isp/floppy.tree/etc/hosts new file mode 100644 index 0000000000000..5b9108cabc1d4 --- /dev/null +++ b/release/picobsd/isp/floppy.tree/etc/hosts @@ -0,0 +1,5 @@ +# $Id: hosts.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +# This file should contain the addresses and aliases +# for local hosts that share this file. +127.0.0.1 localhost localhost.mydomain.org.pl +127.0.0.1 pico.mydomain.org.pl diff --git a/release/picobsd/isp/floppy.tree/etc/login.conf b/release/picobsd/isp/floppy.tree/etc/login.conf index 9361a33c2f9e9..3bfdd8ae6fa99 100644 --- a/release/picobsd/isp/floppy.tree/etc/login.conf +++ b/release/picobsd/isp/floppy.tree/etc/login.conf @@ -1,7 +1,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:45 abial Exp $ # @@ -45,7 +45,7 @@ standard:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ :path=~/bin /bin /usr/bin:\ - :nologin=/var/run/nologin:\ + :nologin=/etc/nologin:\ :cputime=1h30m:\ :datasize=8M:\ :stacksize=2M:\ diff --git a/release/picobsd/isp/floppy.tree/etc/motd b/release/picobsd/isp/floppy.tree/etc/motd new file mode 100644 index 0000000000000..8efbc7f97a5ab --- /dev/null +++ b/release/picobsd/isp/floppy.tree/etc/motd @@ -0,0 +1,12 @@ +======================================================= + [31m)\_)\[37m +PicoBSD 0.42 (ISP-alpha) [31m([37m[1mo,o[m[31m)[37m + [32m__ [31m\~/[37m +Witamy w PicoBSD! [32m-->=[41m===[40m[31m\[37m + [32m~~[37m [31md d[37m +W glownym katalogu w pliku README znajdziesz [35mpico[37m +krotki opis systemu. Mozesz go obejrzec przy pomocy +"more /README". + +Wiecej informacji znajdziesz u autora (abial@nask.pl). + diff --git a/release/picobsd/isp/floppy.tree/etc/rc b/release/picobsd/isp/floppy.tree/etc/rc new file mode 100644 index 0000000000000..bcb8c2bd02fe9 --- /dev/null +++ b/release/picobsd/isp/floppy.tree/etc/rc @@ -0,0 +1,62 @@ +#!/bin/sh +# $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 !!!!! ### +############################################ +mount -a -t nonfs +if [ -f /etc/rc.conf ]; then + . /etc/rc.conf +fi +rm -f /var/run/* +if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then + echo "Dodaje $swapfile jako dodatkowy swap." + vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b +fi +# configure serial devices +if [ -f /etc/rc.serial ]; then + . /etc/rc.serial +fi +# start up the initial network configuration. +if [ -f /etc/rc.network ]; then + . /etc/rc.network + network_pass1 +fi +mount -a -t nfs +# clean up left-over files +(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) +if [ -n "$network_pass1_done" ]; then + network_pass2 +fi +if [ -n "$network_pass2_done" ]; then + network_pass3 +fi +if [ "X${inetd_enable}" = X"YES" ]; then + echo "Uruchamiam inetd."; inetd ${inetd_flags} +fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Uruchamiam snmpd."; snmpd ${snmpd_flags} +fi + +dev_mkdb + +echo '' +if [ "x$swapfile" = "xNO" ]; then + echo "UWAGA: brak swapu!" + echo "Nie uruchamiaj zbyt wielu programow na raz..." +fi +echo '' +echo '' +echo '+------------ PicoBSD 0.42 (ISP) --------------+' +echo '| |' +echo '| Zaloguj sie jako "root" (haslo "setup"). |' +echo '| |' +echo '| Ta wersja PicoBSD w pelni podlega |' +echo '| licencji BSD. Po wiecej szczegolow zajrzyj |' +echo '| na http://www.freebsd.org/~picobsd, lub |' +echo '| skontaktuj sie z autorem. |' +echo '| |' +echo '| abial@nask.pl |' +echo '| |' +echo '+----------------------------------------------+' +exit 0 diff --git a/release/picobsd/isp/floppy.tree/etc/rc.conf b/release/picobsd/isp/floppy.tree/etc/rc.conf new file mode 100644 index 0000000000000..aa1ae8c927655 --- /dev/null +++ b/release/picobsd/isp/floppy.tree/etc/rc.conf @@ -0,0 +1,25 @@ +#!/bin/sh +# $Id: rc.conf.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +swapfile="NO" # Set to name of swapfile if aux swapfile desired. +### Network configuration sub-section ###################### +### Basic network options: ### +hostname="pico.mydomain.org.pl" # Set this! +firewall="NO" # firewall type (see /etc/rc.firewall) or NO +tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). +network_interfaces="lo0" # List of network interfaces (lo0 is loopback). +ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. +#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. +### Network daemons options: ### +inetd_enable="YES" # Run the network daemon dispatcher (or NO) +inetd_flags="" # Optional flags to inetd +snmpd_enable="YES" # Run the SNMP daemon (or NO) +snmpd_flags="-C -c /etc/snmpd.conf" # Optional flags to snmpd +### Network routing options: ### +defaultrouter="NO" # Set to default gateway (or NO). +static_routes="" # Set to static route list (or leave empty). +gateway_enable="NO" # Set to YES if this host will be a gateway. +arpproxy_all="" # replaces obsolete kernel option ARP_PROXYALL. +### Allow local configuration override at the very end here ## +if [ -f /etc/rc.conf.local ]; then + . /etc/rc.conf.local +fi diff --git a/release/picobsd/isp/floppy.tree/etc/resolv.conf b/release/picobsd/isp/floppy.tree/etc/resolv.conf new file mode 100644 index 0000000000000..4a006565d54a2 --- /dev/null +++ b/release/picobsd/isp/floppy.tree/etc/resolv.conf @@ -0,0 +1,3 @@ +# $Id: resolv.conf.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ +domain mydomain.org.pl +nameserver 148.81.16.51 diff --git a/release/picobsd/isp/floppy.tree/etc/services b/release/picobsd/isp/floppy.tree/etc/services index eec499fafec7c..817b6d3152720 100644 --- a/release/picobsd/isp/floppy.tree/etc/services +++ b/release/picobsd/isp/floppy.tree/etc/services @@ -91,4 +91,3 @@ uucp 540/tcp uucp 540/udp uucp-rlogin 541/tcp uucp-rlogin 541/udp -natd 8668/divert # Network Address Translation diff --git a/release/picobsd/isp/lang/README.en b/release/picobsd/isp/lang/README.en index d1dc2dc057253..18e0cbf5b98c4 100644 --- a/release/picobsd/isp/lang/README.en +++ b/release/picobsd/isp/lang/README.en @@ -30,4 +30,4 @@ I'll be glad hearing from you about your experiences with PicoBSD. Thanks. Have fun! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/isp/lang/README.pl b/release/picobsd/isp/lang/README.pl index a680e20c3f4a8..18ea380788d4f 100644 --- a/release/picobsd/isp/lang/README.pl +++ b/release/picobsd/isp/lang/README.pl @@ -30,4 +30,4 @@ Jakie sa minimalne wymagania? Milej zabawy! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/isp/lang/m.en b/release/picobsd/isp/lang/m.en new file mode 100644 index 0000000000000..077a3b596caf9 --- /dev/null +++ b/release/picobsd/isp/lang/m.en @@ -0,0 +1,11 @@ + +PicoBSD 0.32 (ISP-alpha) + +Welcome to PicoBSD! + +You can find a short description of the +system in file /README. You can view it using +"more /README". + +For more info contact the author (abial@nask.pl). + diff --git a/release/picobsd/isp/lang/m.pl b/release/picobsd/isp/lang/m.pl new file mode 100644 index 0000000000000..8870e1e51dd99 --- /dev/null +++ b/release/picobsd/isp/lang/m.pl @@ -0,0 +1,11 @@ + +PicoBSD 0.32 (ISP-alpha) + +Witamy w PicoBSD! + +W glownym katalogu w pliku README znajdziesz +krotki opis systemu. Mozesz go obejrzec przy pomocy +"more /README". + +Wiecej informacji znajdziesz u autora (abial@nask.pl). + diff --git a/release/picobsd/isp/lang/motd.en b/release/picobsd/isp/lang/motd.en index 77a1949f998ef..4acae898e74ab 100644 --- a/release/picobsd/isp/lang/motd.en +++ b/release/picobsd/isp/lang/motd.en @@ -8,5 +8,5 @@ You can find a short description of the [35mpico[37m system in file /README. You can view it using "more /README". -For more info contact the author (abial@freebsd.org). +For more info contact the author (abial@nask.pl). diff --git a/release/picobsd/isp/lang/motd.pl b/release/picobsd/isp/lang/motd.pl index 1ceed3813fb28..8ee14d36dbcb8 100644 --- a/release/picobsd/isp/lang/motd.pl +++ b/release/picobsd/isp/lang/motd.pl @@ -8,5 +8,5 @@ W glownym katalogu w pliku README znajdziesz [35mpico[37m krotki opis systemu. Mozesz go obejrzec przy pomocy "more /README". -Wiecej informacji znajdziesz u autora (abial@freebsd.org). +Wiecej informacji znajdziesz u autora (abial@nask.pl). diff --git a/release/picobsd/isp/lang/rc.en b/release/picobsd/isp/lang/rc.en index ad135e31ab194..e49427ba4205d 100644 --- a/release/picobsd/isp/lang/rc.en +++ b/release/picobsd/isp/lang/rc.en @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.en,v 1.4 1999/01/12 14:09:20 asami Exp $ +# $Id: rc.en,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ ############################################ ### Special setup for one floppy PICOBSD ### ### THIS IS NOT THE NORMAL /etc/rc !!!!! ### @@ -25,6 +25,7 @@ fi mount -a -t nfs chmod 666 /dev/tty[pqrsPQRS]* # clean up left-over files +rm -f /etc/nologin (cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) if [ -n "$network_pass1_done" ]; then network_pass2 @@ -35,6 +36,9 @@ fi if [ "X${inetd_enable}" = X"YES" ]; then echo "Starting inetd."; inetd ${inetd_flags} fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Starting snmpd."; snmpd ${snmpd_flags} +fi dev_mkdb @@ -54,7 +58,7 @@ echo '| BSD license. For more details see |' echo '| http://www.freebsd.org/~picobsd, or contact |' echo '| the author. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/isp/lang/rc.pl b/release/picobsd/isp/lang/rc.pl index 38e0e3156e1d3..33e896b49c64f 100644 --- a/release/picobsd/isp/lang/rc.pl +++ b/release/picobsd/isp/lang/rc.pl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.pl,v 1.3 1998/11/01 20:19:19 abial Exp $ +# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:42 abial Exp $ ############################################ ### Special setup for one floppy PICOBSD ### ### THIS IS NOT THE NORMAL /etc/rc !!!!! ### @@ -34,6 +34,9 @@ fi if [ "X${inetd_enable}" = X"YES" ]; then echo "Uruchamiam inetd."; inetd ${inetd_flags} fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Uruchamiam snmpd."; snmpd ${snmpd_flags} +fi dev_mkdb @@ -53,7 +56,7 @@ echo '| licencji BSD. Po wiecej szczegolow zajrzyj |' echo '| na http://www.freebsd.org/~picobsd, lub |' echo '| skontaktuj sie z autorem. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/isp/lang/update.en b/release/picobsd/isp/lang/update.en index a821d4c9df561..acbd0dea8ca71 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.3 1998/08/10 19:16:43 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd ${pwd} echo " Done." diff --git a/release/picobsd/isp/lang/update.pl b/release/picobsd/isp/lang/update.pl index 1b2c52358c910..3a95e0002bf9f 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.3 1998/08/10 19:16:43 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd ${pwd} echo " Zrobione." diff --git a/release/picobsd/net/conf/Makefile b/release/picobsd/net/conf/Makefile index 06f74873e7a82..52a6b75c6e3b2 100644 --- a/release/picobsd/net/conf/Makefile +++ b/release/picobsd/net/conf/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1998/10/15 21:40:02 abial Exp $ +# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $ # SRC?=/usr/src @@ -17,5 +17,5 @@ $(KERNFILE): PICOBSD (cd ${CONF}; \ config ${CONFFILE}; \ cd ${COMPILE}; \ - make depend all) + make depend && make) diff --git a/release/picobsd/net/conf/PICOBSD b/release/picobsd/net/conf/PICOBSD index 89cf63b10632f..24ebe4e083562 100644 --- a/release/picobsd/net/conf/PICOBSD +++ b/release/picobsd/net/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.7 1999/01/18 10:17:33 abial Exp $ +# $Id: PICOBSD,v 1.2 1998/09/02 14:16:03 abial Exp $ # machine "i386" @@ -13,14 +13,14 @@ maxusers 10 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT options NFS #Network Filesystem options MFS options MSDOSFS #MSDOS Filesystem options "CD9660" #ISO 9660 Filesystem +options PROCFS #Process filesystem options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor -options INTRO_USERCONFIG #imply -c and parse info area +options USERCONFIG_BOOT #imply -c and parse info area options VISUAL_USERCONFIG #visual boot -c editor options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT @@ -32,21 +32,21 @@ options NO_LKM #options DUMMYNET #options BRIDGE -config kernel root on fd0a +config kernel root on fd0 controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port "IO_WD1" bio irq 14 vector wdintr disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 @@ -55,34 +55,39 @@ options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM # syscons is the default console driver, resembling an SCO console +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 -device vga0 at isa? port ? conflicts -device sc0 at isa? tty +device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -device npx0 at isa? port IO_NPX irq 13 +device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr +device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr +device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 - -device lpt0 at isa? port? tty irq 7 +device lpt0 at isa? port? tty irq 7 vector lptintr # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. device de0 +device de1 device fxp0 - -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 +device fxp1 + +device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr +device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 vector edintr +device ie0 at isa? port 0x280 net irq 10 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector ieintr +device ep0 at isa? port 0x300 net irq 10 vector epintr +device ep1 at isa? port 0x280 net irq 5 vector epintr +#device ex0 at isa? port? net irq? vector exintr +#device fe0 at isa? port 0x300 net irq ? vector feintr +#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr +#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr +#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr pseudo-device loop pseudo-device ether diff --git a/release/picobsd/net/crunch1/Makefile b/release/picobsd/net/crunch1/Makefile index 8ee9026bb1253..0966f3830be6f 100644 --- a/release/picobsd/net/crunch1/Makefile +++ b/release/picobsd/net/crunch1/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.2 1998/10/15 21:40:03 abial Exp $ +# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ # SRC?=/usr/src @@ -7,17 +7,21 @@ all: crunch crunch: @if [ ! -f .patched ]; then \ + cat login.diff|(cd /usr/src/usr.bin/login; patch -p0); \ cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -p0); \ + cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -p0); \ touch .patched; \ fi @cat crunch.conf|sed -e "s@/usr/src@${SRC}@" >crunch1.conf @crunchgen ./crunch1.conf - @${MAKE} -f crunch1.mk -DNOPAM all \ + @${MAKE} -f crunch1.mk all \ "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY -DNOSECURE -DNOCRYPT" #2>&1 >/dev/null clean: @if [ -f .patched ]; then \ + cat login.diff|(cd /usr/src/usr.bin/login; patch -R -p0); \ cat passwd.diff|(cd /usr/src/usr.bin/passwd; patch -R -p0); \ + cat ppp.diff|(cd /usr/src/usr.sbin/ppp; patch -R -p0); \ rm .patched; \ fi rm -f *.o *.stub *.lo *_stub.c *.mk \ @@ -38,7 +42,7 @@ install: done rm /mnt/stand/crunch # Install the MIB files - #cp mibs/*.txt /mnt/usr/local/share/snmp/mibs/ + cp mibs/*.txt /mnt/usr/local/share/snmp/mibs/ .include <bsd.prog.mk> diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf index 1114f069002db..7aa5e1d1e593a 100644 --- a/release/picobsd/net/crunch1/crunch.conf +++ b/release/picobsd/net/crunch1/crunch.conf @@ -1,5 +1,5 @@ # -# $Id: crunch.conf,v 1.4 1998/09/15 11:12:25 abial Exp $ +# $Id: crunch.conf,v 1.3 1998/09/15 07:35:38 abial Exp $ # # NOTE: the string "/usr/src" will be automatically replaced with the # correct value set in 'build' script - you should change it there @@ -16,7 +16,7 @@ srcdirs ../../tinyware # 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.3 +srcdirs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5 # other sources srcdirs /usr/src/bin srcdirs /usr/src/sbin/i386 @@ -27,13 +27,12 @@ srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec progs ash test echo hostname ln login getty stty -progs inetd telnetd w msg kget +progs inetd telnetd w msg kget snmpd progs init ifconfig df sps ns vm cat progs cp rm mknod chmod chown mkdir ls syslogd progs sysctl route pwd_mkdb dev_mkdb progs mount mount_msdos umount progs kill mount_std natd -#progs snmpd progs pwd ppp telnet more progs passwd date @@ -55,7 +54,7 @@ ln ns netstat ln chown chgrp # For snmpd -#libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5.3/snmplib/libsnmp.a +libs /usr/ports/net/ucd-snmp/work/ucd-snmp-3.5/snmplib/libsnmp.a libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm libs -lgnuregex -ltelnet diff --git a/release/picobsd/net/floppy.tree/etc/hosts b/release/picobsd/net/floppy.tree/etc/hosts new file mode 100644 index 0000000000000..c3563eae8767b --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/hosts @@ -0,0 +1,5 @@ +# $Id: hosts.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +# This file should contain the addresses and aliases +# for local hosts that share this file. +127.0.0.1 localhost localhost.mydomain.org.pl +127.0.0.1 pico.mydomain.org.pl diff --git a/release/picobsd/net/floppy.tree/etc/login.conf b/release/picobsd/net/floppy.tree/etc/login.conf index 8e0451e1d2d74..bde61214b21c6 100644 --- a/release/picobsd/net/floppy.tree/etc/login.conf +++ b/release/picobsd/net/floppy.tree/etc/login.conf @@ -1,7 +1,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +# $Id: login.conf,v 1.1.1.1 1998/07/14 07:30:49 abial Exp $ # @@ -45,7 +45,7 @@ standard:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ :path=~/bin /bin /usr/bin:\ - :nologin=/var/run/nologin:\ + :nologin=/etc/nologin:\ :cputime=1h30m:\ :datasize=8M:\ :stacksize=2M:\ diff --git a/release/picobsd/net/floppy.tree/etc/motd b/release/picobsd/net/floppy.tree/etc/motd new file mode 100644 index 0000000000000..547a0684b95b2 --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/motd @@ -0,0 +1,12 @@ +======================================================= + [31m)\_)\[37m +PicoBSD 0.42 (NET) [31m([37m[1mo,o[m[31m)[37m + [32m__ [31m\~/[37m +Witamy w PicoBSD! [32m-->=[41m===[40m[31m\[37m + [32m~~[37m [31md d[37m +W glownym katalogu w pliku README znajdziesz [35mpico[37m +krotki opis systemu. Mozesz go obejrzec przy pomocy +"more /README". + +Wiecej informacji znajdziesz u autora (abial@nask.pl). + diff --git a/release/picobsd/net/floppy.tree/etc/rc b/release/picobsd/net/floppy.tree/etc/rc new file mode 100644 index 0000000000000..05c5f4f5b6f06 --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/rc @@ -0,0 +1,62 @@ +#!/bin/sh +# $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 !!!!! ### +############################################ +mount -a -t nonfs +if [ -f /etc/rc.conf ]; then + . /etc/rc.conf +fi +rm -f /var/run/* +if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then + echo "Dodaje $swapfile jako dodatkowy swap." + vnconfig /dev/vn0b $swapfile && swapon /dev/vn0b +fi +# configure serial devices +if [ -f /etc/rc.serial ]; then + . /etc/rc.serial +fi +# start up the initial network configuration. +if [ -f /etc/rc.network ]; then + . /etc/rc.network + network_pass1 +fi +mount -a -t nfs +# clean up left-over files +(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) +if [ -n "$network_pass1_done" ]; then + network_pass2 +fi +if [ -n "$network_pass2_done" ]; then + network_pass3 +fi +if [ "X${inetd_enable}" = X"YES" ]; then + echo "Uruchamiam inetd."; inetd ${inetd_flags} +fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Uruchamiam snmpd."; snmpd ${snmpd_flags} +fi + +dev_mkdb + +echo '' +if [ "x$swapfile" = "xNO" ]; then + echo "UWAGA: brak swapu!" + echo "Nie uruchamiaj zbyt wielu programow na raz..." +fi +echo '' +echo '' +echo '+------------ PicoBSD 0.42 (NET) --------------+' +echo '| |' +echo '| Zaloguj sie jako "root" (haslo "setup"). |' +echo '| |' +echo '| Ta wersja PicoBSD w pelni podlega |' +echo '| licencji BSD. Po wiecej szczegolow zajrzyj |' +echo '| na http://www.freebsd.org/~picobsd, lub |' +echo '| skontaktuj sie z autorem. |' +echo '| |' +echo '| abial@nask.pl |' +echo '| |' +echo '+----------------------------------------------+' +exit 0 diff --git a/release/picobsd/net/floppy.tree/etc/rc.conf b/release/picobsd/net/floppy.tree/etc/rc.conf new file mode 100644 index 0000000000000..c4cdac8b90001 --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/rc.conf @@ -0,0 +1,25 @@ +#!/bin/sh +# $Id: rc.conf.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +swapfile="NO" # Set to name of swapfile if aux swapfile desired. +### Network configuration sub-section ###################### +### Basic network options: ### +hostname="pico.mydomain.org.pl" # Set this! +firewall="NO" # firewall type (see /etc/rc.firewall) or NO +tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). +network_interfaces="lo0" # List of network interfaces (lo0 is loopback). +ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. +#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. +### Network daemons options: ### +inetd_enable="YES" # Run the network daemon dispatcher (or NO) +inetd_flags="" # Optional flags to inetd +snmpd_enable="YES" # Run the SNMP daemon (or NO) +snmpd_flags="-C -c /etc/snmpd.conf" # Optional flags to snmpd +### Network routing options: ### +defaultrouter="NO" # Set to default gateway (or NO). +static_routes="" # Set to static route list (or leave empty). +gateway_enable="NO" # Set to YES if this host will be a gateway. +arpproxy_all="" # replaces obsolete kernel option ARP_PROXYALL. +### Allow local configuration override at the very end here ## +if [ -f /etc/rc.conf.local ]; then + . /etc/rc.conf.local +fi diff --git a/release/picobsd/net/floppy.tree/etc/rc.network b/release/picobsd/net/floppy.tree/etc/rc.network new file mode 100644 index 0000000000000..3079c94d9604e --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/rc.network @@ -0,0 +1,80 @@ +#!/bin/sh - +# $Id: rc.network.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +network_pass1() { + echo -n 'Wstepna konfiguracja sieci:' + # Set the host name if it is not already set + if [ -z "`hostname -s`" ] ; then + hostname $hostname + echo ' hostname' + fi + # Set up all the network interfaces, calling startup scripts if needed + for ifn in ${network_interfaces}; do + if [ -e /etc/start_if.${ifn} ]; then + . /etc/start_if.${ifn} + fi + # Do the primary ifconfig if specified + eval ifconfig_args=\$ifconfig_${ifn} + if [ -n "${ifconfig_args}" ] ; then + ifconfig ${ifn} ${ifconfig_args} + fi + # Check to see if aliases need to be added + alias=0 + while : + do + eval ifconfig_args=\$ifconfig_${ifn}_alias${alias} + if [ -n "${ifconfig_args}" ]; then + ifconfig ${ifn} ${ifconfig_args} alias + alias=`expr ${alias} + 1` + else + break; + fi + done + ifconfig ${ifn} + done + # Load the filters if required + if [ -n "$firewall_enable" -a -f /etc/rc.firewall -a \ + "x$firewall_enable" = "xYES" ] ; then + . /etc/rc.firewall + echo "Zaladowano reguly filtrujace do firewalla." + else + echo "UWAGA: system posiada wbudowany modul firewalla, ale zadne reguly" + echo " filtrujace nie zostaly zaladowane." + echo " Wszystkie rodzaje ruchu IP sa dozwolone." + fi + # Configure routing + if [ "x$defaultrouter" != "xNO" ] ; then + static_routes="default ${static_routes}" + route_default="default ${defaultrouter}" + fi + # Set up any static routes. This should be done before router discovery. + if [ "x${static_routes}" != "x" ]; then + for i in ${static_routes}; do + eval route_args=\$route_${i} + route add ${route_args} + done + fi + echo -n 'Dodatkowe opcje routingu:' + if [ -n "$tcp_extensions" -a "x$tcp_extensions" != "xYES" ] ; then + echo -n ' tcp_extensions=NO' + sysctl -w net.inet.tcp.rfc1323=0 >/dev/null 2>&1 + sysctl -w net.inet.tcp.rfc1644=0 >/dev/null 2>&1 + fi + if [ "X$gateway_enable" = X"YES" ]; then + echo -n ' IP_gateway=YES' + sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 + fi + if [ "X$arpproxy_all" = X"YES" ]; then + echo -n ' wlaczam ARP_PROXY_ALL: ' + sysctl -w net.link.ether.inet.proxyall=1 2>&1 + fi + echo '.' + network_pass1_done=YES # Let future generations know we made it. +} + +network_pass2() { + network_pass2_done=YES +} + +network_pass3() { + network_pass3_done=YES +} diff --git a/release/picobsd/net/floppy.tree/etc/resolv.conf b/release/picobsd/net/floppy.tree/etc/resolv.conf new file mode 100644 index 0000000000000..fe9223b69f874 --- /dev/null +++ b/release/picobsd/net/floppy.tree/etc/resolv.conf @@ -0,0 +1,3 @@ +# $Id: resolv.conf.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +domain mydomain.org.pl +nameserver 148.81.16.51 diff --git a/release/picobsd/net/floppy.tree/etc/services b/release/picobsd/net/floppy.tree/etc/services index eec499fafec7c..817b6d3152720 100644 --- a/release/picobsd/net/floppy.tree/etc/services +++ b/release/picobsd/net/floppy.tree/etc/services @@ -91,4 +91,3 @@ uucp 540/tcp uucp 540/udp uucp-rlogin 541/tcp uucp-rlogin 541/udp -natd 8668/divert # Network Address Translation diff --git a/release/picobsd/net/lang/README.en b/release/picobsd/net/lang/README.en index 2d358de0a937b..ad398f76a24dc 100644 --- a/release/picobsd/net/lang/README.en +++ b/release/picobsd/net/lang/README.en @@ -38,4 +38,4 @@ I'll be glad hearing from you about your experiences with PicoBSD. Thanks. Have fun! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/net/lang/README.pl b/release/picobsd/net/lang/README.pl index d7e3f6755ceb7..3ac412c3fa57e 100644 --- a/release/picobsd/net/lang/README.pl +++ b/release/picobsd/net/lang/README.pl @@ -53,4 +53,4 @@ Jakie sa roznice w stosunku do poprzedniej wersji? Milej zabawy! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/net/lang/m.en b/release/picobsd/net/lang/m.en new file mode 100644 index 0000000000000..f6df2234bf011 --- /dev/null +++ b/release/picobsd/net/lang/m.en @@ -0,0 +1,11 @@ + +PicoBSD 0.35 (NET) + +Welcome to PicoBSD! + +You can find a short description of the +system in file /README. You can view it using +"more /README". + +For more info contact the author (abial@nask.pl). + diff --git a/release/picobsd/net/lang/m.pl b/release/picobsd/net/lang/m.pl new file mode 100644 index 0000000000000..ff39857afb1f3 --- /dev/null +++ b/release/picobsd/net/lang/m.pl @@ -0,0 +1,11 @@ + +PicoBSD 0.35 (NET) + +Witamy w PicoBSD! + +W glownym katalogu w pliku README znajdziesz +krotki opis systemu. Mozesz go obejrzec przy pomocy +"more /README". + +Wiecej informacji znajdziesz u autora (abial@nask.pl). + diff --git a/release/picobsd/net/lang/motd.en b/release/picobsd/net/lang/motd.en index f3f774471f112..c498edc1aa6f9 100644 --- a/release/picobsd/net/lang/motd.en +++ b/release/picobsd/net/lang/motd.en @@ -8,5 +8,5 @@ You can find a short description of the [35mpico[37m system in file /README. You can view it using "more /README". -For more info contact the author (abial@freebsd.org). +For more info contact the author (abial@nask.pl). diff --git a/release/picobsd/net/lang/motd.pl b/release/picobsd/net/lang/motd.pl index 9f8cedfe797c3..12acd4e2a66f4 100644 --- a/release/picobsd/net/lang/motd.pl +++ b/release/picobsd/net/lang/motd.pl @@ -8,5 +8,5 @@ W glownym katalogu w pliku README znajdziesz [35mpico[37m krotki opis systemu. Mozesz go obejrzec przy pomocy "more /README". -Wiecej informacji znajdziesz u autora (abial@freebsd.org). +Wiecej informacji znajdziesz u autora (abial@nask.pl). diff --git a/release/picobsd/net/lang/rc.en b/release/picobsd/net/lang/rc.en index 295a882dfc7a6..7658846b71441 100644 --- a/release/picobsd/net/lang/rc.en +++ b/release/picobsd/net/lang/rc.en @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.en,v 1.4 1999/01/12 14:09:21 asami Exp $ +# $Id: rc.en,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ ############################################ ### Special setup for one floppy PICOBSD ### ### THIS IS NOT THE NORMAL /etc/rc !!!!! ### @@ -25,6 +25,7 @@ fi mount -a -t nfs chmod 666 /dev/tty[pqrsPQRS]* # clean up left-over files +rm -f /etc/nologin (cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) if [ -n "$network_pass1_done" ]; then network_pass2 @@ -35,6 +36,9 @@ fi if [ "X${inetd_enable}" = X"YES" ]; then echo "Starting inetd."; inetd ${inetd_flags} fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Starting snmpd."; snmpd ${snmpd_flags} +fi dev_mkdb @@ -54,7 +58,7 @@ echo '| BSD license. For more details see |' echo '| http://www.freebsd.org/~picobsd, or contact |' echo '| the author. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/net/lang/rc.pl b/release/picobsd/net/lang/rc.pl index d19f3367a6f2d..130ec42fe546e 100644 --- a/release/picobsd/net/lang/rc.pl +++ b/release/picobsd/net/lang/rc.pl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.pl,v 1.3 1998/11/01 20:19:23 abial Exp $ +# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ ############################################ ### Special setup for one floppy PICOBSD ### ### THIS IS NOT THE NORMAL /etc/rc !!!!! ### @@ -34,6 +34,9 @@ fi if [ "X${inetd_enable}" = X"YES" ]; then echo "Uruchamiam inetd."; inetd ${inetd_flags} fi +if [ "X${snmpd_enable}" = X"YES" ]; then + echo "Uruchamiam snmpd."; snmpd ${snmpd_flags} +fi dev_mkdb @@ -53,7 +56,7 @@ echo '| licencji BSD. Po wiecej szczegolow zajrzyj |' echo '| na http://www.freebsd.org/~picobsd, lub |' echo '| skontaktuj sie z autorem. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' exit 0 diff --git a/release/picobsd/net/lang/update.en b/release/picobsd/net/lang/update.en index cf6e1b131b427..012cbaacd6983 100755 --- a/release/picobsd/net/lang/update.en +++ b/release/picobsd/net/lang/update.en @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: update.en,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +# $Id: update.en,v 1.3 1998/08/10 19:17:11 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd ${pwd} echo " Done." diff --git a/release/picobsd/net/lang/update.pl b/release/picobsd/net/lang/update.pl index 3055d05356f6f..c1bf95b7f2cb0 100755 --- a/release/picobsd/net/lang/update.pl +++ b/release/picobsd/net/lang/update.pl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: update.pl,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ +# $Id: update.pl,v 1.3 1998/08/10 19:17:11 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a cd ${pwd} echo " Zrobione." diff --git a/release/picobsd/router/conf/Makefile b/release/picobsd/router/conf/Makefile index bd33b5e9d02d9..52a6b75c6e3b2 100644 --- a/release/picobsd/router/conf/Makefile +++ b/release/picobsd/router/conf/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1998/10/15 21:40:05 abial Exp $ +# $Id: Makefile,v 1.2 1998/09/29 12:12:47 abial Exp $ # SRC?=/usr/src @@ -17,5 +17,5 @@ $(KERNFILE): PICOBSD (cd ${CONF}; \ config ${CONFFILE}; \ cd ${COMPILE}; \ - make depend all) + make depend && make) diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD index 4a277e8ec2fcc..0a8d652c1d9f9 100644 --- a/release/picobsd/router/conf/PICOBSD +++ b/release/picobsd/router/conf/PICOBSD @@ -1,5 +1,5 @@ # -# $Id: PICOBSD,v 1.10 1999/01/14 23:22:51 abial Exp $ +# $Id: PICOBSD,v 1.5 1998/09/23 15:20:55 abial Exp $ # machine "i386" @@ -13,7 +13,6 @@ maxusers 10 #options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT #options NFS #Network Filesystem options MFS #options MSDOSFS #MSDOS Filesystem @@ -34,21 +33,21 @@ options NO_SWAPPING #options DUMMYNET #options BRIDGE -config kernel root on fd0a +config kernel root on fd0 controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 #options "CMD640" # work around CMD640 chip deficiency -#controller wdc0 at isa? port "IO_WD1" bio irq 14 +#controller wdc0 at isa? port "IO_WD1" bio irq 14 vector wdintr #disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 -#controller wdc1 at isa? port "IO_WD2" bio irq 15 +#controller wdc1 at isa? port "IO_WD2" bio irq 15 vector wdintr #disk wd2 at wdc1 drive 0 #disk wd3 at wdc1 drive 1 @@ -57,20 +56,16 @@ disk fd0 at fdc0 drive 0 #device wcd0 #IDE CD-ROM # syscons is the default console driver, resembling an SCO console +device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 -device vga0 at isa? port ? conflicts -device sc0 at isa? tty +device npx0 at isa? port "IO_NPX" irq 13 vector npxintr -device npx0 at isa? port IO_NPX irq 13 - -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 +device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 +device sio2 at isa? disable port "IO_COM3" tty irq 5 vector siointr +device sio3 at isa? disable port "IO_COM4" tty irq 9 vector siointr -#device lpt0 at isa? port? tty irq 7 +#device lpt0 at isa? port? tty irq 7 vector lptintr # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. @@ -79,16 +74,23 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9 device de0 device fxp0 -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 +device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr +device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 vector edintr +device ie0 at isa? port 0x280 net irq 10 iomem 0xd0000 vector ieintr +device ie1 at isa? port 0x300 net irq 5 iomem 0xd8000 vector ieintr +device ep0 at isa? port 0x300 net irq 10 vector epintr +device ep1 at isa? port 0x280 net irq 5 vector epintr +#device ex0 at isa? port? net irq? vector exintr +#device fe0 at isa? port 0x300 net irq ? vector feintr +#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr +#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr +#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr +#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr pseudo-device loop pseudo-device ether -#pseudo-device tun 2 +#pseudo-device tun 4 #pseudo-device vn #pseudo-device bpfilter 4 pseudo-device ppp 4 diff --git a/release/picobsd/router/floppy.tree/etc/hosts b/release/picobsd/router/floppy.tree/etc/hosts new file mode 100644 index 0000000000000..d74ecbad93f0c --- /dev/null +++ b/release/picobsd/router/floppy.tree/etc/hosts @@ -0,0 +1,5 @@ +# $Id: hosts.pl,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +# This file should contain the addresses and aliases +# for local hosts that share this file. +127.0.0.1 localhost localhost.mydomain.org.pl +127.0.0.1 pico.mydomain.org.pl diff --git a/release/picobsd/router/floppy.tree/etc/login.conf b/release/picobsd/router/floppy.tree/etc/login.conf index caa56994130b5..d6a8d955949da 100644 --- a/release/picobsd/router/floppy.tree/etc/login.conf +++ b/release/picobsd/router/floppy.tree/etc/login.conf @@ -1,7 +1,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +# $Id: login.conf,v 1.1 1998/08/02 13:03:30 abial Exp $ # @@ -45,7 +45,7 @@ standard:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ :path=~/bin /bin /usr/bin:\ - :nologin=/var/run/nologin:\ + :nologin=/etc/nologin:\ :cputime=1h30m:\ :datasize=8M:\ :stacksize=2M:\ diff --git a/release/picobsd/router/floppy.tree/etc/motd b/release/picobsd/router/floppy.tree/etc/motd new file mode 100644 index 0000000000000..41b2fb6a7706a --- /dev/null +++ b/release/picobsd/router/floppy.tree/etc/motd @@ -0,0 +1,11 @@ +======================================================= + [31m)\_)\[37m +PicoBSD 0.42 (ROUTER) [31m([37m[1mo,o[m[31m)[37m + [32m__ [31m\~/[37m +Witamy w PicoBSD! [32m-->=[41m===[40m[31m\[37m + [32m~~[37m [31md d[37m +Dokumentacja systemu znajduje sie na [35mpico[37m +http://www.freebsd.org/~picobsd/. + +Wiecej informacji znajdziesz u autora (abial@nask.pl). + diff --git a/release/picobsd/router/floppy.tree/etc/rc b/release/picobsd/router/floppy.tree/etc/rc new file mode 100644 index 0000000000000..13716d4d87454 --- /dev/null +++ b/release/picobsd/router/floppy.tree/etc/rc @@ -0,0 +1,18 @@ +#!/bin/sh +# $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.42 (ROUTER) ------------+' +echo '| |' +echo '| Ta wersja PicoBSD podlega w pelni licencji |' +echo '| BSD. Wiecej informacji mozna znalezc na |' +echo '| http://www.freebsd.org/~picobsd, lub u |' +echo '| autora. |' +echo '| |' +echo '| abial@nask.pl |' +echo '| |' +echo '+----------------------------------------------+' +echo "" diff --git a/release/picobsd/router/floppy.tree/etc/rc.conf b/release/picobsd/router/floppy.tree/etc/rc.conf new file mode 100644 index 0000000000000..84e6fc9c4ddfb --- /dev/null +++ b/release/picobsd/router/floppy.tree/etc/rc.conf @@ -0,0 +1,25 @@ +#!/bin/sh +# $Id: rc.conf,v 1.2 1998/08/10 19:17:49 abial Exp $ +swapfile="NO" # Set to name of swapfile if aux swapfile desired. +### Network configuration sub-section ###################### +### Basic network options: ### +hostname="pico.mydomain.org.pl" # Set this! +firewall="NO" # firewall type (see /etc/rc.firewall) or NO +tcp_extensions="NO" # Allow RFC1323 & RFC1644 extensions (or NO). +network_interfaces="lo0" # List of network interfaces (lo0 is loopback). +ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. +#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. +### Network daemons options: ### +inetd_enable="YES" # Run the network daemon dispatcher (or NO) +inetd_flags="" # Optional flags to inetd +snmpd_enable="YES" # Run the SNMP daemon (or NO) +snmpd_flags="-C -c /etc/snmpd.conf" # Optional flags to snmpd +### Network routing options: ### +defaultrouter="NO" # Set to default gateway (or NO). +static_routes="" # Set to static route list (or leave empty). +gateway_enable="NO" # Set to YES if this host will be a gateway. +arpproxy_all="" # replaces obsolete kernel option ARP_PROXYALL. +### Allow local configuration override at the very end here ## +if [ -f /etc/rc.conf.local ]; then + . /etc/rc.conf.local +fi diff --git a/release/picobsd/router/floppy.tree/etc/resolv.conf b/release/picobsd/router/floppy.tree/etc/resolv.conf new file mode 100644 index 0000000000000..d24da1e19f137 --- /dev/null +++ b/release/picobsd/router/floppy.tree/etc/resolv.conf @@ -0,0 +1,3 @@ +# $Id: resolv.conf.pl,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +domain mydomain.org.pl +nameserver 148.81.16.51 diff --git a/release/picobsd/router/floppy.tree/etc/services b/release/picobsd/router/floppy.tree/etc/services index eec499fafec7c..817b6d3152720 100644 --- a/release/picobsd/router/floppy.tree/etc/services +++ b/release/picobsd/router/floppy.tree/etc/services @@ -91,4 +91,3 @@ uucp 540/tcp uucp 540/udp uucp-rlogin 541/tcp uucp-rlogin 541/udp -natd 8668/divert # Network Address Translation diff --git a/release/picobsd/router/lang/README.en b/release/picobsd/router/lang/README.en index 71e9dd267f46f..bd289fecafdca 100644 --- a/release/picobsd/router/lang/README.en +++ b/release/picobsd/router/lang/README.en @@ -37,4 +37,4 @@ I'll be glad hearing from you about your experiences with PicoBSD. Thanks. Have fun! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/router/lang/README.pl b/release/picobsd/router/lang/README.pl index 269348b20c5c8..ed440c1d03a91 100644 --- a/release/picobsd/router/lang/README.pl +++ b/release/picobsd/router/lang/README.pl @@ -36,4 +36,4 @@ Po dalsze szczegoly zajrzyj do oryginalnej dokumentacji. Milej zabawy! -Andrzej Bialecki <abial@freebsd.org> +Andrzej Bialecki <abial@nask.pl> diff --git a/release/picobsd/router/lang/motd.pl b/release/picobsd/router/lang/motd.pl index cfdbba9e18aa8..0bb3818862890 100644 --- a/release/picobsd/router/lang/motd.pl +++ b/release/picobsd/router/lang/motd.pl @@ -7,5 +7,5 @@ Witamy w PicoBSD! [32m-->=[41m===[40m[31m\[37m Dokumentacja systemu znajduje sie na [35mpico[37m http://www.freebsd.org/~picobsd/. -Wiecej informacji znajdziesz u autora (abial@freebsd.org). +Wiecej informacji znajdziesz u autora (abial@nask.pl). diff --git a/release/picobsd/router/lang/rc.en b/release/picobsd/router/lang/rc.en index ee7614ddbcedb..21a0e4b09f2ff 100644 --- a/release/picobsd/router/lang/rc.en +++ b/release/picobsd/router/lang/rc.en @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.en,v 1.2 1998/09/26 17:27:26 abial Exp $ +# $Id: rc.en,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ ### Special setup for one floppy PICOBSD ### ifconfig lo0 inet 127.0.0.1 netmask 0xffffff00 hostname pico @@ -12,7 +12,7 @@ echo '| BSD license. For more details see |' echo '| http://www.freebsd.org/~picobsd, or contact |' echo '| the author. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' echo "" diff --git a/release/picobsd/router/lang/rc.pl b/release/picobsd/router/lang/rc.pl index 686eec6aa1a25..167a145b4f95f 100644 --- a/release/picobsd/router/lang/rc.pl +++ b/release/picobsd/router/lang/rc.pl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.pl,v 1.2 1998/09/26 17:27:26 abial Exp $ +# $Id: rc.pl,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ ### Special setup for one floppy PICOBSD ### ifconfig lo0 inet 127.0.0.1 netmask 0xffffff00 hostname pico @@ -12,7 +12,7 @@ echo '| BSD. Wiecej informacji mozna znalezc na |' echo '| http://www.freebsd.org/~picobsd, lub u |' echo '| autora. |' echo '| |' -echo '| abial@freebsd.org |' +echo '| abial@nask.pl |' echo '| |' echo '+----------------------------------------------+' echo "" diff --git a/release/picobsd/router/lang/update.en b/release/picobsd/router/lang/update.en index 894f70b257a24..552840c151ae3 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 1998/08/10 19:17:55 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a echo " Done." diff --git a/release/picobsd/router/lang/update.pl b/release/picobsd/router/lang/update.pl index c4ad1c69932e6..5790eb61bd84a 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 1998/08/10 19:17:55 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 -incore /start_floppy/kernel.config /stand/vanilla umount /dev/fd0a echo " Zrobione." diff --git a/release/picobsd/tinyware/aps/README b/release/picobsd/tinyware/aps/README index 760af8b53ce7f..2664c449bbaf6 100644 --- a/release/picobsd/tinyware/aps/README +++ b/release/picobsd/tinyware/aps/README @@ -11,9 +11,9 @@ When I have some time, I'll add usual switches and other functions that normal Also, what I'm now inclined to think is that it should be reworked to use more general (and less complicated) sysctl(3). -<abial@freebsd.org> +<abial@nask.pl> (As of 1998.07.31 this program is no longer used in PicoBSD. See sps(1) in TinyWare collection). -$Id: README,v 1.1.1.1 1998/08/27 17:38:44 abial Exp $ +$Id: README,v 1.2 1998/07/31 20:57:42 abial Exp $ diff --git a/release/picobsd/tinyware/help/README b/release/picobsd/tinyware/help/README index ededf1f29db42..8b86ba1375766 100644 --- a/release/picobsd/tinyware/help/README +++ b/release/picobsd/tinyware/help/README @@ -3,6 +3,6 @@ This is work in progress. Eventually I'll prepare the help system for newbies, and these files are just the beginning of it... -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.1.1.1 1998/07/14 07:30:53 abial Exp $ diff --git a/release/picobsd/tinyware/help/help.c b/release/picobsd/tinyware/help/help.c index 5c49a04c6d390..0e0c9cc543547 100644 --- a/release/picobsd/tinyware/help/help.c +++ b/release/picobsd/tinyware/help/help.c @@ -1,6 +1,6 @@ /*- * Copyright (c) 1998 Eric P. Scott <eps@sirius.com> - * Copyright (c) 1998 Andrzej Bialecki <abial@freebsd.org> + * Copyright (c) 1998 Andrzej Bialecki <abial@nask.pl> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: help.c,v 1.3 1998/09/23 14:51:34 abial Exp $ + * $Id: help.c,v 1.2 1998/09/07 19:00:34 abial Exp $ */ diff --git a/release/picobsd/tinyware/kget/Makefile b/release/picobsd/tinyware/kget/Makefile index ba9fe16aa7b0c..d55e863b19f61 100644 --- a/release/picobsd/tinyware/kget/Makefile +++ b/release/picobsd/tinyware/kget/Makefile @@ -1,9 +1,9 @@ -# $Id: Makefile,v 1.3 1998/10/25 03:16:02 abial Exp $ +# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ # -SRC?=/usr/src PROG=kget -CFLAGS+= -I${SRC}/sys -SRCS= kget.c +CFLAGS+= -I/usr/src/sys -DUC_PRIVATE -DKERN_NO_SYMBOLS +SRCS= uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_main.h \ + uc_eisa.c uc_pci.c NOMAN=yes .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/kget/README b/release/picobsd/tinyware/kget/README index 9490dd747969b..2acc5ea552d37 100644 --- a/release/picobsd/tinyware/kget/README +++ b/release/picobsd/tinyware/kget/README @@ -1,15 +1,12 @@ -1999.01.06 +1998.06.29 What is it? ----------- -This utility allows to gather device configuration which possibly -was changed in userconfig (-c) session, and to save it to /kernel.config -file on startup floppy, so that when user boots next time, the -settings will automatically be changed. - -This program uses sysctl(3) interface to retrieve data from the kernel - -the machdep.uc_devlist sysctl was added Jan 5 1999 to 3.0-current. +This utility is taken almost in its entirety from /stand/sysinstall. It allows +to gather device configuration which possibly was changed in userconfig (-c) +session, and to save it to /kernel.config file on startup floppy, so that when +user boots next time, the settings will automatically be changed. How can I use it? ----------------- @@ -17,25 +14,34 @@ How can I use it? The best way is to call it from /etc/rc in such phase when the startup floppy is mounted, and redirect its output to /kernel.config on the floppy. -Usage is straightforward: +NOTE: You need first to create symbols' list, using 'dumpnlist' utility, and +place it in /stand/symbols. - kget output_filename +Usage is straightforward: -where output_filename is either regular file (then it's created or -overwritten), or a "-" meaning standard output. + kget -incore|kernel_name output_filename [vanilla] In simplest form you can do - kget - + kget -incore - + +to list current in core parameters, or + + kget kernel_file - + +to see settings of another kernel. + +or -to list current in-core parameters, or + kget -incore - /stand/vanilla - kget /kernel.config +to produce list of changes from 'vanilla' configuration. You can redirect this +list to /kernel.config file with no changes - it already contains required +keywords. -to produce list of changes from 'vanilla' configuration and write -it to /kernel.config file - it already contains required keywords. +Credits go to Jordan K. Hubbard for 95% of this code. The rest is mine :-) Andrzej Bialecki -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.3 1998/11/01 20:19:40 abial Exp $ +$Id: README,v 1.2 1998/08/11 06:53:21 abial Exp $ diff --git a/release/picobsd/tinyware/kget/kget.c b/release/picobsd/tinyware/kget/kget.c deleted file mode 100644 index b8426e4fdc867..0000000000000 --- a/release/picobsd/tinyware/kget/kget.c +++ /dev/null @@ -1,113 +0,0 @@ -/*- - * Copyright (c) 1999 Andrzej Bialecki <abial@freebsd.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (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: kget.c,v 1.1 1999/01/08 21:09:42 abial Exp $ - */ - -#include <stdio.h> -#include <string.h> -#include <sys/types.h> -#include <sys/sysctl.h> -#include "i386/isa/isa_device.h" - -struct isa_device *id; -char *p; - -int -main(int argc, char *argv[]) -{ - int len,i; - char *buf; - char *mib="machdep.uc_devlist"; - char name[9]; - FILE *fout; - - if(argc<2) { - fout=stdout; - } else { - if(strcmp(argv[1],"-")==0) { - fout=stdout; - } else { - fout=fopen(argv[1],"w"); - if(fout==NULL) { - perror("opening output file"); - exit(1); - } - } - } - - /* We use sysctlbyname, because the oid is unknown (OID_AUTO) */ - - /* get the buffer size */ - i=sysctlbyname(mib,NULL,&len,NULL,NULL); - if(i) { - perror("buffer sizing"); - exit(-1); - } - buf=(char *)malloc(len*sizeof(char)); - i=sysctlbyname(mib,buf,&len,NULL,NULL); - if(i) { - perror("retrieving data"); - exit(-1); - } - i=0; - while(i<len) { - id=(struct isa_device *)(buf+i); - p=(buf+i+sizeof(struct isa_device)); - strncpy(name,p,8); - if(!id->id_enabled) { - fprintf(fout,"di %s%d\n",name,id->id_unit); - } else { - fprintf(fout,"en %s%d\n",name,id->id_unit); - if(id->id_iobase>0) { - fprintf(fout,"po %s%d %#x\n",name,id->id_unit, - id->id_iobase); - } - if(id->id_irq>0) { - fprintf(fout,"ir %s%d %d\n",name,id->id_unit, - ffs(id->id_irq)-1); - } - if(id->id_drq>0) { - fprintf(fout,"dr %s%d %d\n",name,id->id_unit, - id->id_drq); - } - if(id->id_maddr>0) { - fprintf(fout,"iom %s%d %#x\n",name,id->id_unit, - id->id_maddr); - } - if(id->id_msize>0) { - fprintf(fout,"ios %s%d %d\n",name,id->id_unit, - id->id_msize); - } - fprintf(fout,"f %s%d %#x\n",name,id->id_unit, - id->id_flags); - } - i+=sizeof(struct isa_device)+8; - } - fprintf(fout,"q\n"); - fclose(fout); - free(buf); - exit(0); -} diff --git a/release/picobsd/tinyware/kget/kget.h b/release/picobsd/tinyware/kget/kget.h new file mode 100644 index 0000000000000..fc88782379f7b --- /dev/null +++ b/release/picobsd/tinyware/kget/kget.h @@ -0,0 +1,2 @@ +#define SAFE_STRCPY strcpy +#define msgDebug printf diff --git a/release/picobsd/tinyware/kget/uc_eisa.c b/release/picobsd/tinyware/kget/uc_eisa.c new file mode 100644 index 0000000000000..c0483fc8d3a2b --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_eisa.c @@ -0,0 +1,166 @@ +/*************************************************** + * file: userconfig/uc_eisa.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.5 1998/09/14 19:14:11 jkh Exp $ + */ + +#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <nlist.h> +#include <i386/eisa/eisaconf.h> + +#include "uc_main.h" + +struct eisa_device_node { + struct eisa_device dev; + struct eisa_device_node *next; +}; + +/* module prototypes */ +static void eisa_fill_in(struct kernel *, struct uc_eisa *, struct eisa_device_node *); + +void +get_eisa_info(struct kernel *kp){ + int i, total; + u_int *ls; + struct eisa_driver *ed; + struct uc_eisa *ep, *epc; + char *name; + + if(kp->nl[EISA_SET].n_value || kp->nl[EISA_LIST].n_value) { + ep=epc=(struct uc_eisa *)malloc(sizeof(struct uc_eisa)); + if(!kp->incore) { + if(kp->nl[EISA_SET].n_value) { + u_int ndev; + ls=(u_int *)kv_to_u(kp, kp->nl[EISA_SET].n_value, sizeof(u_int)*10); /* XXX, size? */ + ndev=ls[0]; + for(i=1;i<(ndev+1);i++){ + ep=(struct uc_eisa *)realloc(ep, sizeof(struct uc_eisa)*i); + epc = ep+(i-1); + ed=(struct eisa_driver *)kv_to_u(kp, ls[i], sizeof(struct eisa_driver)); + name=(char *)kv_to_u(kp, (u_int)ed->name, 10); /* XXX, size? */ + asprintf(&epc->device, "%s", name); + asprintf(&epc->full_name, "?"); + } + ep=(struct uc_eisa *)realloc(ep, sizeof(struct uc_eisa)*i); + epc = ep+(i-1); + bzero(epc, sizeof(struct uc_eisa)); + kp->eisa_devp=ep; + } else { /* not incore and no symbol, we have no EISA devs... */ + kp->eisa_devp=(struct uc_eisa *)0; + } + } else { + /* if we're incore, we can get data from _eisa_dev_list, */ + /* which should be much more useful, but I'll need a machine */ + /* to test :( */ + if(kp->nl[EISA_LIST].n_value) { + u_int t; + struct eisa_device_node *edn; + + t=kv_dref_p(kp, kp->nl[EISA_LIST].n_value); + total=0; + while(t) { + edn=(struct eisa_device_node *) + kv_to_u(kp, t,sizeof(struct eisa_device_node)); + ep=(struct uc_eisa *)realloc(ep, sizeof(struct uc_eisa)*(total+1)); + epc=ep+total; + eisa_fill_in(kp, epc, edn); + t=(u_int)edn->next; + free(edn); + total++; + } + + ep=(struct uc_eisa *)realloc(ep, sizeof(struct uc_eisa)*(total+1)); + epc=ep+total; + bzero(epc, sizeof(struct uc_eisa)); + kp->eisa_devp=ep; + } else { + kp->eisa_devp=(struct uc_eisa *)0; + } + } + } else { + kp->eisa_devp=(struct uc_eisa *)0; + } +} + +struct list * +get_eisa_devlist(struct kernel *kp){ + struct list *dl; + struct uc_eisa *kdp; + + dl=list_new(); + + for(kdp=kp->eisa_devp; kdp->device; kdp++){ + list_append(dl, kdp->device); + } + return(dl); +} + + +struct list * +get_eisa_device(struct uc_eisa *ep){ + struct list *list; + list=list_new(); + + list_append(list, ep->device); + list_append(list, ep->full_name); + + return(list); +} + + +static void +eisa_fill_in(struct kernel *kp, struct uc_eisa *epc, struct eisa_device_node *edn){ + struct eisa_driver *edrv; + char *n; + + edrv=(struct eisa_driver *)kv_to_u(kp, (u_int)edn->dev.driver, + sizeof(struct eisa_driver)); + + n=(char *)kv_to_u(kp, (u_int)edrv->name, 20); + 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*/ + asprintf(&epc->full_name, "%s", n); + free(n); + free(edrv); +} + +void +eisa_free(struct kernel *kp, int writeback){ + struct uc_eisa *ep; + + for(ep=kp->eisa_devp;ep->device;ep++){ + free(ep->device); + free(ep->full_name); + } + free(kp->eisa_devp); + kp->eisa_devp=0; +} + +/* end of userconfig/uc_eisa.c */ diff --git a/release/picobsd/tinyware/kget/uc_isa.c b/release/picobsd/tinyware/kget/uc_isa.c new file mode 100644 index 0000000000000..6a5d750e49d9e --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_isa.c @@ -0,0 +1,211 @@ +/*************************************************** + * file: userconfig/uc_isa.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.5 1998/10/06 07:41:48 msmith Exp $ + */ + +#include <sys/types.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <nlist.h> +#include <i386/isa/isa_device.h> + +#include "uc_main.h" + +void +get_isa_info(struct kernel *kp){ + int total, i, j; + struct uc_isa *idp; + struct isa_device *p, *isa_dp; + struct isa_driver *drv; + char *name; + + if(kp->nl[ISA_BIOTAB].n_value || kp->nl[ISA_TTYTAB].n_value || kp->nl[ISA_NETTAB].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 */ + + for (i=0; i<6; i++) { /* the isa devices */ + if(kp->nl[i].n_value) { + p = isa_dp = (struct isa_device *)kv_to_u(kp, kp->nl[i].n_value, /* XXX size? */ + sizeof(struct isa_device)*30); + /* build the device list */ + /* `total' keeps a running total of all the devices found */ + for (j=0; p->id_id; j++, p++, total++) { + kp->isa_devp = (struct uc_isa *)realloc(kp->isa_devp, + sizeof(struct uc_isa)*(total+1)); + idp=kp->isa_devp+total; + + drv=(struct isa_driver *)kv_to_u(kp, (u_int)p->id_driver, sizeof(struct isa_driver)); + name=(char *)kv_to_u(kp, (u_int)drv->name, 64); + + if (i==ISA_WDCTAB || i==ISA_FDCTAB) { /* special case the disk devices */ + char n[10]; + strncpy(n, name, 10); + n[strlen(n)-1]=0; /* chop off the trailing 'c' */ + asprintf(&idp->device, "%s%d", n, j); + } else { + asprintf(&idp->device, "%s%d", name, p->id_unit); + } + idp->port=p->id_iobase; + idp->irq=p->id_irq; + idp->drq=p->id_drq; + idp->iomem=(u_int)p->id_maddr & 0xFFFFFF; /* kludge to get pa from kva */ + idp->iosize=p->id_msize; + idp->flags=p->id_flags; + idp->alive=p->id_alive; + idp->enabled=p->id_enabled; + idp->modified=0; + if(!kp->incore){ + idp->idp=p; + } else { + free(name); + free(drv); + } + } + if(kp->incore){ + free(isa_dp); + } + } + } + + idp=kp->isa_devp+total; + bzero(idp, sizeof(struct uc_isa)); + } else { + kp->isa_devp=0; + } +} + + +struct list * +get_isa_devlist(struct kernel *kp){ + struct list *dl; + struct uc_isa *kdp; + + dl=list_new(); + + for(kdp=kp->isa_devp; kdp->device; kdp++){ + list_append(dl, kdp->device); + } + return(dl); +} + + +struct list * +get_isa_device(struct uc_isa *ip){ + struct list *list; + char *tmp; + + list=list_new(); + + asprintf(&tmp, "%s", ip->device ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "0x%04x", ip->port ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "%d", ip->irq>0 ? ffs(ip->irq)-1 : ip->irq); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "%d", ip->drq ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "0x%08x", ip->iomem ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "0x%x", ip->iosize ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "0x%x", ip->flags ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "%d", ip->alive ); + list_append(list, tmp); + free(tmp); + + asprintf(&tmp, "%d", ip->enabled ); + list_append(list, tmp); + free(tmp); + + return(list); +} + +int +isa_setdev(struct kernel *kp, struct list *list){ + int r=1, irq; + struct uc_isa *ip; + + if(kp->isa_devp) + for(ip=kp->isa_devp;ip->device;ip++){ + if(strcmp(list->av[0], ip->device)==0){ + ip->modified=1; + ip->port = strtol(list->av[1], (char **)NULL, 0); + irq=strtol(list->av[2], (char **)NULL, 0); + ip->irq= irq > 0 ? 1 << (irq) : irq; + ip->drq = strtol(list->av[3], (char **)NULL, 0); + ip->iomem = strtol(list->av[4], (char **)NULL, 0); + ip->iosize = strtol(list->av[5], (char **)NULL, 0); + ip->flags = strtol(list->av[6], (char **)NULL, 0); + ip->enabled = strtol(list->av[8], (char **)NULL, 0); + r=0; + break; + } + } + return(r); +} + +void +isa_free(struct kernel *kp, int writeback){ + struct uc_isa *ip; + for(ip=kp->isa_devp; ip->device; ip++){ + if((!kp->incore) && ip->modified && writeback) { + /* save any changes */ + ip->idp->id_iobase=ip->port; + ip->idp->id_irq = ip->irq; + ip->idp->id_drq = ip->drq; + ip->idp->id_maddr = (caddr_t)ip->iomem; + ip->idp->id_msize = ip->iosize; + ip->idp->id_flags = ip->flags; + ip->idp->id_enabled = ip->enabled; + } + /* and, be free... */ + free(ip->device); + } + /* and free the whole ball of wax */ + free(kp->isa_devp); + kp->isa_devp=0; +} + +/* end of userconfig/uc_isa.c */ diff --git a/release/picobsd/tinyware/kget/uc_kmem.c b/release/picobsd/tinyware/kget/uc_kmem.c new file mode 100644 index 0000000000000..159fb150a5d41 --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_kmem.c @@ -0,0 +1,87 @@ +/*************************************************** + * file: userconfig/uc_kmem.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.3 1997/02/22 14:12:28 peter Exp $ + */ + +#include <sys/types.h> +#include <stdlib.h> +#include <unistd.h> +#include <a.out.h> + +#include <stdio.h> + +#include "uc_main.h" + +/* translate a kv pointer to user space */ +/* malloc()-ing if we aren't mmaped */ +u_int +kv_to_u(struct kernel *kp, u_int adr, u_int size){ + u_int tadr; + if(!kp->incore){ + struct exec *ep; + ep=(struct exec *)kp->core; + tadr=(u_int)((adr - ep->a_entry + (N_DATOFF(*ep) - ep->a_text))+kp->core); + } else { + caddr_t ptr; + ptr = malloc(size); + lseek(kp->fd, adr, SEEK_SET); + read(kp->fd, ptr, size); + tadr=(u_int)ptr; + } + return(tadr); +} + +/* dereference a pointer to kernel space */ +u_int +kv_dref_p(struct kernel *kp, u_int adr){ + u_int tadr; + if(!kp->incore){ + struct exec *ep; + ep=(struct exec *)kp->core; + tadr=*(u_int*)((adr - ep->a_entry + (N_DATOFF(*ep) - ep->a_text))+kp->core); + } else { + lseek(kp->fd, adr, SEEK_SET); + read(kp->fd, &tadr, sizeof(tadr)); + } + return(tadr); +} + +/* deref a pointer to kernel text */ +u_int +kv_dref_t(struct kernel *kp, u_int adr){ + u_int tadr; + if(!kp->incore){ + struct exec *ep; + ep=(struct exec *)kp->core; + tadr=*(u_int*)((adr - ep->a_entry) + N_TXTOFF(*ep) + (u_int)kp->core); + } else { + lseek(kp->fd, adr, SEEK_SET); + read(kp->fd, &tadr, sizeof(tadr)); + } + return(tadr); +} + +/* end of userconfig/uc_kmem.c */ diff --git a/release/picobsd/tinyware/kget/uc_list.c b/release/picobsd/tinyware/kget/uc_list.c new file mode 100644 index 0000000000000..e2b6bd5cb5847 --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_list.c @@ -0,0 +1,76 @@ +/*************************************************** + * file: userconfig/uc_isa.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.3 1997/02/22 14:12:29 peter Exp $ + */ + +#include <sys/types.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <nlist.h> +#include "uc_main.h" + +struct list * +list_new(void){ + struct list *rv; + rv=(struct list *)malloc(sizeof(struct list)); + rv->ac=0; + rv->av=(char **)0; + return(rv); +} + +void +list_append(struct list *list , char *item){ + + if(list->ac==0) { + list->av=(char **)malloc(sizeof(char *)*(list->ac+1)); + } else { + list->av=(char **)realloc(list->av, sizeof(char *)*(list->ac+1)); + } + asprintf(list->av+list->ac, "%s", item); + list->ac++; +} + +void +list_print(struct list *list, char *separator){ + int i; + for(i=0; i<list->ac; i++) + printf("%s%s", list->av[i], separator); +} + +void +list_destroy(struct list *list){ + int i; + for(i=0;i<list->ac;i++){ + free(list->av[i]); + list->av[i]=0; + } + free(list->av); + list->av=0; + free(list); +} + +/* end of userconfig/uc_list.c */ diff --git a/release/picobsd/tinyware/kget/uc_main.c b/release/picobsd/tinyware/kget/uc_main.c new file mode 100644 index 0000000000000..2f39a11a1a96b --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_main.c @@ -0,0 +1,475 @@ +/*************************************************** + * file: userconfig/uc_main.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * library functions for userconfig library + * + */ + +#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <paths.h> +#include <sys/mman.h> +#include <nlist.h> +#include <sys/stat.h> +#include <fcntl.h> + +#include "uc_main.h" +#include "kget.h" + +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"}, + {"_isa_biotab_fdc"}, + {"_eisadriver_set"}, + {"_eisa_dev_list"}, + {"_pcidevice_set"}, + {"_device_list"}, + {"_scbusses"}, +#ifdef USE_SCSI + {"_scsi_cinit"}, + {"_scsi_dinit"}, + {"_scsi_tinit"}, +#endif + {""}, +}; + +int +isDebug() { + return(0); +} + +struct list * +vc_getdev(char *vanilla) +{ + FILE *fd; + struct list *dl; + char buf[100]; + + fd=fopen(vanilla,"r"); + if(fd==NULL) { + printf("no such file: %s\n",vanilla); + exit(2); + } + dl=list_new(); + while(!feof(fd)) { + buf[0]='\0'; + if(fgets(buf,99,fd)==NULL) continue; + buf[strlen(buf)-1]='\0'; + list_append(dl,buf); + } + fclose(fd); + return(dl); +} + +void +process(struct list *d, struct list *v, int flag) +{ + int i,idx,found; + int len; + char *tok,*sep=" "; + char *parm[]= {"<devname>", + "port", + "irq", + "drq", + "iomem", + "iosize", + "flags", + "<alive>", + "<enabled>", + "<modified>"}; + + if(!flag) { + fprintf(f_out,"%s",d->av[0]); + for(i=1;i<d->ac;i++) { + fprintf(f_out," %s",d->av[i]); + } + fprintf(f_out,"\n"); + return; + } + found=0; + for(i=0;i<v->ac;i++) { + if(strncmp(d->av[0],v->av[i],strlen(d->av[0]))!=0) continue; + found++; + break; + } + if(!found) { + printf("\nWhoa!\n"); + printf("Couldn't find device %s in 'vanilla' list!\n", + d->av[0]); + printf("It seems that kernel image and 'vanilla' list are out of sync...\n"); + exit(2); + } + idx=i; + if(strcmp(d->av[8],"0")==0) { /* disable and return */ + fprintf(f_out,"disable %s\n",d->av[0]); + return; + } + tok=strtok(v->av[idx],sep); /* discard <name> */ + for(i=1;i<d->ac;i++) { + tok=strtok(NULL,sep); /* get next param from string */ + if(tok==NULL) { + fprintf(stderr,"Hmmm... strange error, please report!\n"); + fprintf(stderr,"Include the 'kget -incore' output and the device name (%s)\n",d->av[0]); + exit(10); + } + if(strcmp(d->av[i],tok)!=0) { /* changed */ + switch(i) { + case 7: /* alive */ + break; + case 8: /* enable/disable */ + if(strcmp(d->av[i],"0")==0) { /* disable */ + fprintf(f_out,"disable %s\n",d->av[0]); + return; + } else { + fprintf(f_out,"enable %s\n",d->av[0]); + } + break; + case 2: /* special case for npx */ + if(strcmp(d->av[0],"npx0")==0) continue; + /* FALLTHROUGH */ + default: + fprintf(f_out,"%s %s %s\n",parm[i],d->av[0],d->av[i]); + break; + } + } + } + return; +} + +int main(int argc, char *argv[]) +{ + struct kernel *core; + struct list *c_isa, *c_dev,*v_isa; + int d,j,cnt=0; + int diff=0; + char buf[100]; + + if(argc<3) { + printf("Usage: %s name|-incore -|filename [vanilla]\n",argv[0]); + exit(1); + } + if(argc>3) { + v_isa=vc_getdev(argv[3]); + diff++; + } + core=uc_open(argv[1]); + c_isa=uc_getdev(core,"-isa"); + if(c_isa==NULL) { + printf("no symbols in kernel?\n"); + exit(2); + } + if(strcmp(argv[2],"-")==NULL) { + f_out=stdout; + } else { + f_out=fopen(argv[2],"w"); + if(f_out==NULL) f_out=stdout; + } + if(diff) fprintf(f_out,"USERCONFIG\n"); + for(d=0;d<c_isa->ac;d++) { + c_dev=uc_getdev(core,c_isa->av[d]); + process(c_dev,v_isa,diff); + } + if(diff) fprintf(f_out,"quit\n"); + uc_close(core,0); + exit(0); +} + +struct kernel * +uc_open(char *name){ + int kd, flags, incore; + struct kernel *kern; + struct stat sb; + char kname[80]; + int size, i = 0; + struct nlist *nl = _nl; + + if (strcmp(name, "-incore") == 0) + incore = 1; + else + incore = 0; + + if (incore || (strcmp(name,"-bootfile") == 0)) + SAFE_STRCPY(kname, getbootfile()); + else + SAFE_STRCPY(kname, name); + + if (isDebug()) + msgDebug("uc_open: kernel name is %s, incore = %d\n", kname, incore); + kern = (struct kernel *)malloc(sizeof(struct kernel)); + +#ifdef KERN_NO_SYMBOLS + if (incore) { + FILE *fp; + + fp = fopen("/stand/symbols", "r"); + if (!fp) { + msgDebug("Couldn't open /stand/symbols file! Punting.\n"); + free(kern); + return NULL; + } + if (fscanf(fp, "%d\n", &size) != 1) { + msgDebug("Unable to get # of name list entries from symbol file.\n"); + free(kern); + return NULL; + } + else if (isDebug()) + msgDebug("uc_open: opened /stand/symbols file, reading %d entries.\n", size); + + + kern->nl = nl = (struct nlist *)malloc((size + 1) * sizeof(struct nlist)); + bzero(nl, (size + 1) * sizeof(struct nlist)); + for (i = 0; i < size; i++) { + char *cp, name[255]; + int c1; + unsigned int uc1; + short d1; + unsigned long v1; + + if (fgets(name, 255, fp) == NULL) { + msgDebug("Can't get name field for entry %d\n", i); + free(kern); + return NULL; + } + if ((cp = index(name, '\n')) != NULL) + *cp = '\0'; + nl[i].n_name = strdup(name); + if (fscanf(fp, "%u %d %hd %ld\n", &uc1, &c1, &d1, &v1) == 4) { + nl[i].n_type = (unsigned char)uc1; + nl[i].n_other = (char)c1; + nl[i].n_desc = d1; + nl[i].n_value = v1; + if (isDebug()) + msgDebug("uc_open: for entry %d, decoded: \"%s\", %u %d %hd %ld\n", i, nl[i].n_name, nl[i].n_type, nl[i].n_other, nl[i].n_desc, nl[i].n_value); + } + } + nl[i].n_name = ""; + fclose(fp); + i = 0; + } + else +#endif + i = nlist(kname, nl); + if (i == -1) { + msgDebug("uc_open: kernel %s does not contain symbols.\n", kname); + free(kern); + return NULL; + } +#ifdef KERN_NO_SYMBOLS + if (!incore) { +#else + { +#endif + kern->nl=(struct nlist *)malloc(sizeof(_nl)); + bcopy(_nl, kern->nl, sizeof(_nl)); + } + + if (incore) { + if (isDebug()) + msgDebug("uc_open: attempting to open /dev/kmem for incore.\n"); + if ((kd = open("/dev/kmem", O_RDONLY)) < 0) { + free(kern); + msgDebug("uc_open: Unable to open /dev/kmem.\n"); + return NULL; + } + kern->core = (caddr_t)NULL; + kern->incore = 1; + kern->size = 0; + } + else { + if (stat(kname, &sb) < 0) { + free(kern); + msgDebug("uc_open: Unable to stat %s.\n", kname); + return NULL; + } + kern->size = sb.st_size; + flags = sb.st_flags; + + if (chflags(kname, 0) < 0) { + free(kern); + msgDebug("uc_open: Unable to chflags %s.\n", kname); + return NULL; + } + + if (isDebug()) + msgDebug("uc_open: attempting to open %s\n", kname); + if ((kd = open(kname, O_RDWR, 0644)) < 0) { + free(kern); + msgDebug("uc_open: Unable to open %s.\n", kname); + return NULL; + } + + fchflags(kd, flags); + + if (isDebug()) + msgDebug("uc_open: attempting to mmap %d bytes\n", sb.st_size); + kern->core = mmap((caddr_t)0, sb.st_size, PROT_READ | PROT_WRITE, + MAP_SHARED, kd, 0); + kern->incore = 0; + if (kern->core == MAP_FAILED) { + free(kern); + msgDebug("uc_open: Unable to mmap from %s.\n", kname); + return NULL; + } + } + + kern->fd = kd; + get_isa_info(kern); + if (isDebug()) + msgDebug("uc_open: got isa information\n"); + + get_pci_info(kern); + if (isDebug()) + msgDebug("uc_open: got pci information\n"); + + get_eisa_info(kern); + if (isDebug()) + msgDebug("uc_open: got eisa information\n"); +#ifdef USE_SCSI + get_scsi_info(kern); + if (isDebug()) + msgDebug("uc_open: got scsi information\n"); +#else + kern->scsi_devp=(struct uc_scsi*)NULL; + kern->scsibus_devp=(struct uc_scsibus*)NULL; +#endif + return kern; +} + +int +uc_close(struct kernel *kern, int writeback) +{ + if (kern->isa_devp) + isa_free(kern, writeback); + + if (kern->eisa_devp) + eisa_free(kern, writeback); /* `writeback' isn't really useful here */ + + if (kern->pci_devp) + pci_free(kern, writeback); /* or here */ + +#ifdef USE_SCSI + if (kern->scsi_devp) + scsi_free(kern, writeback); +#endif + + if (!kern->incore) + munmap(kern->core, kern->size); + + close(kern->fd); + free(kern->nl); + free(kern); + + return 0; +} + +struct list * +uc_getdev(struct kernel *kern, char *dev) +{ + struct list *list = (struct list *)0; + + if (*dev == '-') { /* asked for -isa, -eisa, -pci, -scsi, -all */ + if (strcmp(dev, "-all") == 0) { + list = list_new(); + if (kern->isa_devp) + list_append(list, "isa"); + + if (kern->eisa_devp) + list_append(list, "eisa"); + + if (kern->pci_devp) + list_append(list, "pci"); + + if (kern->scsi_devp) + list_append(list, "scsi"); + + } + else if (strcmp(dev, "-isa") == 0) + list = get_isa_devlist(kern); + else if (strcmp(dev, "-eisa") == 0) + list = get_eisa_devlist(kern); + else if (strcmp(dev, "-pci") == 0) + list = get_pci_devlist(kern); +#ifdef USE_SCSI + else if (strcmp(dev, "-scsi") == 0) + list = get_scsi_devlist(kern); +#endif + } + else { + /* we gotta figure out which real device to report */ + struct uc_isa *ip; + struct uc_scsi *sp; + struct uc_pci *pp; + struct uc_eisa *ep; + + if (kern->isa_devp) { + for (ip = kern->isa_devp; ip->device; ip++) { + if (strcmp(dev, ip->device) == 0) { + list = get_isa_device(ip); + goto end; + } + } + } + +#ifdef USE_SCSI + if (kern->scsi_devp) { + for (sp = kern->scsi_devp; sp->device; sp++) { + if (strcmp(dev, sp->device) == 0) { + list = get_scsi_device(sp); + goto end; + } + } + } +#endif + + if (kern->pci_devp) { + for(pp = kern->pci_devp; pp->device; pp++) { + if (strcmp(dev, pp->device) == 0) { + list = get_pci_device(pp); + goto end; + } + } + } + + if (kern->eisa_devp) { + for (ep = kern->eisa_devp; ep->device; ep++) { + if (strcmp(dev, ep->device) == 0) { + list = get_eisa_device(ep); + goto end; + } + } + } + } +end: + return(list); +} diff --git a/release/picobsd/tinyware/kget/uc_main.h b/release/picobsd/tinyware/kget/uc_main.h new file mode 100644 index 0000000000000..326b80622023a --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_main.h @@ -0,0 +1,168 @@ +/*************************************************** + * file: userconfig/uc_main.h + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.5 1998/10/06 07:41:49 msmith Exp $ + */ + +#define ISA_BIOTAB 0 +#define ISA_TTYTAB 1 +#define ISA_NETTAB 2 +#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 16 + +struct kernel { + int fd; /* file descriptor for the kernel image, either a binary or /dev/kmem */ + caddr_t core; /* either the mmap()ed kernel image, or a scratch area */ + u_int size; /* size of the object at ->core */ + int incore; /* true if the kernel is running */ +#ifdef UC_PRIVATE + struct nlist *nl; /* the symbol table */ +#else + void *nl; +#endif + struct uc_isa *isa_devp; /* pointer to the isa devices (if any) */ + struct uc_eisa *eisa_devp; /* pointer to the eisa devices (if any) */ + struct uc_pci *pci_devp; /* pointer to the pci devices (if any) */ + struct uc_scsi *scsi_devp; /* pointer to the scsi devices (if any) */ + struct uc_scsibus *scsibus_devp; /* internal pointer to scsibus wirings */ +}; + +struct uc_isa { + char *device; + u_short port; + u_short irq; + short drq; + u_int iomem; + int iosize; + int flags; + int alive; + int enabled; +#ifdef UC_PRIVATE + struct isa_device *idp; +#else + void *idp; +#endif + int modified; +}; + +struct uc_pci { + char *device; +}; + +struct uc_eisa { + char *device; + char *full_name; +}; + +struct uc_scsibus { + int bus_no; + int unit; + char *driver; +#ifdef UC_PRIVATE + struct scsi_ctlr_config *config; +#else + void *config; +#endif +}; + +struct uc_scsi { + char *device; + char *adapter; + u_short target; + u_short lun; + char *desc; +#ifdef UC_PRIVATE + struct scsi_device_config *config; +#else + void *config; +#endif + int modified; +}; + +/* nearly everything useful returns a list */ + +struct list { + int ac; + char **av; +}; + +/* prototypes */ + +/* uc_main.c */ +/* these are really the only public ones */ +struct kernel *uc_open(char *name); +int uc_close(struct kernel *kern, int writeback); +struct list *uc_getdev(struct kernel *kern, char *dev); + +/* uc_isa.c */ +void get_isa_info(struct kernel *kp); +struct list *get_isa_devlist(struct kernel *kp); +struct list *get_isa_device(struct uc_isa *ip); +int isa_setdev(struct kernel *kp, struct list *list); +void isa_free(struct kernel *kp, int writeback); + +/* uc_eisa.c */ +void get_eisa_info(struct kernel *kp); +struct list *get_eisa_devlist(struct kernel *kp); +struct list *get_eisa_device(struct uc_eisa *ep); +void eisa_free(struct kernel *kp, int writeback); + +/* uc_pci.c */ +void get_pci_info(struct kernel *kp); +struct list *get_pci_devlist(struct kernel *kp); +struct list *get_pci_device(struct uc_pci *pp); +void pci_free(struct kernel *kp, int writeback); + +/* uc_scsi.c */ +void get_scsi_info(struct kernel *kp); +struct list *get_scsi_devlist(struct kernel *kp); +struct list *get_scsi_device(struct uc_scsi *sp); +int scsi_setdev(struct kernel *kp, struct list *list); +void scsi_free(struct kernel *kp, int writeback); + +/* uc_kmem.c */ +u_int kv_to_u(struct kernel *kp, u_int adr, u_int size); +u_int kv_dref_p(struct kernel *kp, u_int adr); +u_int kv_dref_t(struct kernel *kp, u_int adr); + +/* uc_list.c */ +struct list *list_new(void); +void list_append(struct list *list, char *item); +void list_print(struct list *list, char *separator); +void list_destroy(struct list *list); + +/* end of userconfig/uc_main.h */ diff --git a/release/picobsd/tinyware/kget/uc_pci.c b/release/picobsd/tinyware/kget/uc_pci.c new file mode 100644 index 0000000000000..0d8e601c8b404 --- /dev/null +++ b/release/picobsd/tinyware/kget/uc_pci.c @@ -0,0 +1,122 @@ +/*************************************************** + * file: userconfig/uc_pci.c + * + * Copyright (c) 1996 Eric L. Hernes (erich@rrnet.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software withough specific prior written permission + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (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.4 1997/02/22 14:12:33 peter Exp $ + */ + +#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <nlist.h> +#include <pci/pcivar.h> + +#include "uc_main.h" + +void +get_pci_info(struct kernel *kp){ + int i, total; + u_int *ls, ndev; + struct pci_device *pd; + struct uc_pci *pp,*ppc; + char *name; + + if(kp->nl[PCI_SET].n_value){ + pp = ppc = (struct uc_pci *)malloc(sizeof(struct uc_pci)); + ls=(u_int *)kv_to_u(kp, kp->nl[PCI_SET].n_value, sizeof(u_int)*30); /* XXX, size? */ + ndev=ls[0]; + total=0; + for(i=1;i<(ndev+1);i++){ + pp=(struct uc_pci *)realloc(pp, sizeof(struct uc_pci)*(total+1)); + ppc = pp+(total); + pd=(struct pci_device *)kv_to_u(kp, ls[i], sizeof(struct pci_device)); + /* don't try to dereference a null pointer */ + name=pd->pd_name ? (char *)kv_to_u(kp, (u_int)pd->pd_name, 10) : + pd->pd_name; /* XXX, size? */ + if(kp->incore){ + int u, k; + /* incore, we can get unit numbers */ + + u=kv_dref_p(kp, (u_int)pd->pd_count); + for(k=0;k<u;k++,total++){ + pp=(struct uc_pci *)realloc(pp, sizeof(struct uc_pci)*(total+1)); + ppc = pp+(total); + asprintf(&ppc->device, "%s%d", name, k); + } + free(pd); + if(name) + free(name); + } else { + asprintf(&ppc->device, "%s?", name); + total++; + } + } + pp=(struct uc_pci *)realloc(pp, sizeof(struct uc_pci)*(total+1)); + ppc = pp+(total); + bzero(ppc, sizeof(struct uc_pci)); + kp->pci_devp=pp; + } else { + kp->pci_devp=(struct uc_pci *)0; + } +} + + +struct list * +get_pci_devlist(struct kernel *kp){ + struct list *dl; + struct uc_pci *kdp; + + dl=list_new(); + + for(kdp=kp->pci_devp; kdp->device; kdp++){ + list_append(dl, kdp->device); + } + return(dl); +} + + +struct list * +get_pci_device(struct uc_pci *pp){ + struct list *list; + list=list_new(); + + list_append(list, pp->device); + + return(list); +} + +void +pci_free(struct kernel *kp, int writeback){ + struct uc_pci *pp; + + for(pp=kp->pci_devp;pp->device;pp++){ + free(pp->device); + } + free(kp->pci_devp); + kp->pci_devp=0; + +} + +/* end of userconfig/uc_pci.c */ diff --git a/release/picobsd/tinyware/msg/README b/release/picobsd/tinyware/msg/README index 37bac7d929884..a38101bde5fc5 100644 --- a/release/picobsd/tinyware/msg/README +++ b/release/picobsd/tinyware/msg/README @@ -10,6 +10,6 @@ recently added to the kernel sources, so if you don't mind patching your kernel tree, contact me directly - the patches are very small and simple. Andrzej Bialecki -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1 1998/09/15 07:35:58 abial Exp $ +$Id$ diff --git a/release/picobsd/tinyware/ns/README b/release/picobsd/tinyware/ns/README index 07cb5bd43c034..9d68b0b26d943 100644 --- a/release/picobsd/tinyware/ns/README +++ b/release/picobsd/tinyware/ns/README @@ -38,6 +38,6 @@ Bugs to be small, right? :-) Andrzej Bialecki -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.2 1998/09/07 06:41:14 abial Exp $ +$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ diff --git a/release/picobsd/tinyware/oinit/README b/release/picobsd/tinyware/oinit/README index a295f499d6c44..e14b0af068b96 100644 --- a/release/picobsd/tinyware/oinit/README +++ b/release/picobsd/tinyware/oinit/README @@ -118,6 +118,6 @@ Credits The overall framework was taken from FreeBSD /sbin/init. Andrzej Bialecki -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.5 1998/08/11 06:53:47 abial Exp $ diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c index 1bf70bdaf3432..01f8b9741e5be 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.2 1998/10/15 21:40:07 abial Exp $ + * $Id: oinit.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ */ /* @@ -83,7 +83,7 @@ extern char **environ; /* Struct for holding session state */ struct sess { - char tty[16]; /* vty device path */ + char tty[11]; /* vty device path */ pid_t pid; /* pid of process running on it */ int (*func)(int argc, char **argv); /* internal function to run on it (after forking) */ @@ -646,16 +646,6 @@ runcom() void runcom(char *fname) { - int fd; - - close(0); - close(1); - close(2); - fd=open(_PATH_CONSOLE,O_RDWR); - dup2(fd,0); - dup2(fd,1); - dup2(fd,2); - if(fd>2) close(fd); sourcer(fname); } #endif @@ -912,13 +902,9 @@ main(int argc, char **argv) mount("devfs","/dev",MNT_NOEXEC|MNT_RDONLY,0); /* Fill in the sess structures. */ - /* XXX Really, should be filled based upon config file. */ + /* XXX Really, should be filled basing on config file. */ for(i=0;i<MAX_CONS;i++) { - if(i==0) { - sprintf(ttys[i].tty,"/dev/console"); - } else { - sprintf(ttys[i].tty,"/dev/ttyv%c",vty[i]); - } + sprintf(ttys[i].tty,"/dev/ttyv%c",vty[i]); ttys[i].pid=0; ttys[i].func=shell; } diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile index 10ea6df7be54b..20b9ed4c3ee20 100644 --- a/release/picobsd/tinyware/simple_httpd/Makefile +++ b/release/picobsd/tinyware/simple_httpd/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.1 1998/08/31 13:10:25 abial Exp $ +# $Id$ # -PROG=simple_httpd -SRCS= simple_httpd.c +PROG=simple_httpd. +SRCS= simple_httpd..c NOMAN=yes .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/simple_httpd/simple_httpd.c b/release/picobsd/tinyware/simple_httpd/simple_httpd.c index 5b02244e4de9f..0a83f67378157 100644 --- a/release/picobsd/tinyware/simple_httpd/simple_httpd.c +++ b/release/picobsd/tinyware/simple_httpd/simple_httpd.c @@ -13,7 +13,7 @@ */ /* - * $Id: simple_httpd.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ + * $Id: simple_httpd.c,v 1.1 1998/08/19 16:24:06 abial Exp $ */ #include <stdio.h> @@ -31,7 +31,6 @@ #include <string.h> #include <signal.h> #include <sys/wait.h> -#define LOGDIR "/var/log" int http_sock, con_sock; int http_port = 80; @@ -130,7 +129,7 @@ traite_req() strcat(logfile,"/"); strcat(logfile,"jhttp.log"); } - else strcpy(logfile, LOGDIR "/jhttpd.log"); + else strcpy(logfile,"/usr/adm/jhttpd.log"); if ( access(logfile,W_OK)) { @@ -350,9 +349,8 @@ char *adate() struct tm *t; time(&now); t = localtime(&now); - - sprintf(out, "%4d/%02d/%02d %02d:%02d:%02d", - t->tm_year+1900, t->tm_mon+1, t->tm_mday, - t->tm_hour, t->tm_min, t->tm_sec ); + sprintf(out, "%02d:%02d:%02d %02d/%02d/%02d", + t->tm_hour, t->tm_min, t->tm_sec, + t->tm_mday, t->tm_mon+1, t->tm_year ); return out; } diff --git a/release/picobsd/tinyware/sps/README b/release/picobsd/tinyware/sps/README index 771ddaaf88dfd..94098e7e3f2e7 100644 --- a/release/picobsd/tinyware/sps/README +++ b/release/picobsd/tinyware/sps/README @@ -12,6 +12,6 @@ The most serious limitation of 'sps' is that it's unable to retrieve the whole command line. -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.1 1998/07/16 23:21:59 abial Exp $ diff --git a/release/picobsd/tinyware/view/README b/release/picobsd/tinyware/view/README index 1a2c611b67276..53ec9a017c3a0 100644 --- a/release/picobsd/tinyware/view/README +++ b/release/picobsd/tinyware/view/README @@ -81,6 +81,6 @@ Have fun! Andrzej Bialecki -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.2 1998/08/19 06:19:44 abial Exp $ diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c index 0255a6b5bec1a..0c2ad2645914e 100644 --- a/release/picobsd/tinyware/view/view.c +++ b/release/picobsd/tinyware/view/view.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: view.c,v 1.2 1998/10/09 12:42:56 abial Exp $ + * $Id: view.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ */ /* @@ -88,7 +88,6 @@ int max_screen_colors=15; int quit,changed; char **pres; int nimg=0; -int auto_chg=0; int cur_img=0; char act; FILE *log; @@ -402,7 +401,6 @@ int kbd_action(int x, int y, char key) { changed=0; - if(key!='n') auto_chg=0; switch(key) { case 'q': quit=1; @@ -442,23 +440,15 @@ kbd_action(int x, int y, char key) break; case '\n': case 'n': - if(nimg>0) { - if(cur_img<nimg-1) { - cur_img++; - } else { - cur_img=0; - } + if((nimg>0) && (cur_img<nimg-1)) { + cur_img++; png_load(pres[cur_img]); changed++; } break; case 'p': - if(nimg>0) { - if(cur_img>0) { - cur_img--; - } else { - cur_img=nimg-1; - } + if((nimg>0) && (cur_img>0)) { + cur_img--; png_load(pres[cur_img]); changed++; } @@ -519,6 +509,7 @@ main(int argc, char *argv[]) fprintf(log,"VGL initialised\n"); #endif VGLSavePalette(); + VGLMouseInit(VGL_MOUSEHIDE); if(argc>optind) { res=png_load(argv[optind]); } else { @@ -533,14 +524,10 @@ main(int argc, char *argv[]) fprintf(log,"Trying script %s\n",argv[optind]); #endif fgets(buf,99,fsc); - buf[strlen(buf)-1]='\0'; - if(strncmp("VIEW SCRIPT",buf,11)!=NULL) { + if(strcmp("VIEW SCRIPT\n",buf)!=NULL) { VGLEnd(); usage(); } - if(strlen(buf)>12) { - auto_chg=atoi(buf+12); - } fgets(buf,99,fsc); buf[strlen(buf)-1]='\0'; nimg=atoi(buf); @@ -561,7 +548,6 @@ main(int argc, char *argv[]) #endif png_load(pres[cur_img]); } - VGLMouseInit(VGL_MOUSEHIDE); /* Prepare the keyboard */ tcgetattr(0,&t_old); memcpy(&t_new,&t_old,sizeof(struct termios)); @@ -596,12 +582,7 @@ main(int argc, char *argv[]) display(&pic,pal_red,pal_green,pal_blue,&a); changed=0; } - if(auto_chg) { - sleep(auto_chg); - kbd_action(x,y,'n'); - } else { - pause(); - } + pause(); VGLMouseStatus(&x,&y,&buttons); if(buttons & MOUSE_BUTTON3DOWN) { #ifdef DEBUG diff --git a/release/picobsd/tinyware/vm/README b/release/picobsd/tinyware/vm/README index e4d72c1a17d09..ec70bc2cfd1d7 100644 --- a/release/picobsd/tinyware/vm/README +++ b/release/picobsd/tinyware/vm/README @@ -5,6 +5,6 @@ current memory utilisation. The same info is available via sysctl(8) program, but unfortunately this particular variable doesn't have its handler, and consequently it is not displayed in stock version of sysctl(8). -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $ diff --git a/release/picobsd/tinyware/vm/vm.c b/release/picobsd/tinyware/vm/vm.c index cd744952f76f6..710cfb9715328 100644 --- a/release/picobsd/tinyware/vm/vm.c +++ b/release/picobsd/tinyware/vm/vm.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: vm.c,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ + * $Id: vm.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $ */ #include <stdio.h> @@ -32,8 +32,6 @@ #include <sys/vmmeter.h> #include <vm/vm_param.h> -#define pgtok(a) ((a) * (u_int) DEFAULT_PAGE_SIZE >> 10) - int main(int argc, char *argv[]) { @@ -46,17 +44,14 @@ main(int argc, char *argv[]) for(;;) { sysctl(mib,2,&v,&len,NULL,0); if(i==0) { - printf(" procs kB virt mem real mem shared vm shared real free\n"); - printf(" r w l s tot act tot act tot act tot act\n"); + printf(" procs kB virt mem real mem shared vm shared real free\n"); + printf(" r d p s tot act tot act tot act tot act\n"); } - printf("%2hu%2hu%2hu%2hu",v.t_rq-1,v.t_dw+v.t_pw,v.t_sl,v.t_sw); - printf("%7ld %7ld %7ld%7ld", - (long)pgtok(v.t_vm),(long)pgtok(v.t_avm), - (long)pgtok(v.t_rm),(long)pgtok(v.t_arm)); - printf("%7ld%7ld%7ld%7ld%7ld\n", - (long)pgtok(v.t_vmshr),(long)pgtok(v.t_avmshr), - (long)pgtok(v.t_rmshr),(long)pgtok(v.t_armshr), - (long)pgtok(v.t_free)); + printf("%2hu%2hu%2hu%2hu",v.t_rq,v.t_dw,v.t_pw,v.t_sl); + printf("%7u%7u%7u%7u", + v.t_vm<<2,v.t_avm<<2,v.t_rm<<2,v.t_arm<<2); + printf("%7u%7u%7u%7u%7u\n", + v.t_vmshr<<2,v.t_avmshr<<2,v.t_rmshr<<2,v.t_armshr<<2,v.t_free<<2); sleep(5); i++; if(i>22) i=0; diff --git a/release/picobsd/tools/daemon/README b/release/picobsd/tools/daemon/README index 5de11b962eba7..596e6cafdb0cb 100644 --- a/release/picobsd/tools/daemon/README +++ b/release/picobsd/tools/daemon/README @@ -2,6 +2,6 @@ This is a little toy, which implants a color logo of PicoBSD into a file. Documentation: UTSL. -<abial@freebsd.org> +<abial@nask.pl> -$Id: README,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +$Id: README,v 1.1.1.1 1998/07/14 07:30:40 abial Exp $ diff --git a/release/picobsd/tools/dumpnlist/Makefile b/release/picobsd/tools/dumpnlist/Makefile new file mode 100644 index 0000000000000..fe5706e1610a3 --- /dev/null +++ b/release/picobsd/tools/dumpnlist/Makefile @@ -0,0 +1,9 @@ +# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ +# +PROG=dumpnlist +NOMAN=yes +.PATH: ${.CURDIR}/../../.. + +.include <bsd.prog.mk> + + |