MF4S: Syncronise with Luigi's work in -stable.

4 files changed, 173 insertions, 132 deletions

diff --git a/release/picobsd/bridge/config b/release/picobsd/bridge/config
new file mode 100644
index 000000000000..55c330391b1a
--- /dev/null
+++ b/release/picobsd/bridge/config
@@ -0,0 +1,5 @@
+# configuration for picobsd build script.
+# it should only contain variable definitions -- it is sourced
+# by the shell much like rc.conf* files
+
+MY_DEVS="std tun2 vty10 fd0 ad0 pty0 cuaa0 cuaa1 bpf0 bpf1 bpf2"
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf
new file mode 100644
index 000000000000..a635a3bcaef1
--- /dev/null
+++ b/release/picobsd/bridge/crunch.conf
@@ -0,0 +1,168 @@
+#
+# $FreeBSD$
+#
+# configuration file for "bridge" floppy.
+# Depending on your needs, almost surely you will need to
+# modify your configuration to add/remove/change programs used in
+# the floppy image. Remember that some programs also require
+# matching kernel options to enable device drivers etc.
+#
+# Next to most of the programs i have tried to indicate the approximate
+# space consumed, but beware that these values change from release
+# to release, and might depend on the presence of other programs which
+# share the same libraries.
+#
+# NOTE: the string "/usr/src" will be automatically replaced with the
+# correct value set in 'build' script - you should change it there
+
+# Default build options. Basically tell the Makefiles which understand
+# that to use the most compact possible version of the code.
+#
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNOINET6
+
+# directories where to look for sources of various binaries.
+srcdirs /usr/src/bin
+srcdirs /usr/src/sbin/i386
+srcdirs /usr/src/sbin
+srcdirs /usr/src/usr.bin
+srcdirs /usr/src/gnu/usr.bin
+srcdirs /usr/src/usr.sbin
+srcdirs /usr/src/libexec
+# Some programs are especially written for PicoBSD and reside here
+srcdirs /usr/src/release/picobsd/tinyware
+#
+# And there are others (mostly ports) which reside in their specific
+# directories. For them, we use the "special" commands to tell
+# crunchgen where to look for sources, objects, which Makefile
+# variables contain the list of sources and objects, and so on.
+
+# init is almost always necessary.
+progs init # 4KB.
+# fsck is almost always necessary, unless you have everything on the
+# image and use 'tar' or something similar to read/write raw blocks
+# from the floppy.
+progs fsck # 24KB.
+# ifconfig is needed if you want to configure interfaces...
+progs ifconfig # 4KB.
+#
+# You will also need a shell and a bunch of utilities.
+# The standard shell is not that large, but you need many
+# external programs. In fact most of them do not take much space
+# as they merely issue a system call, and print the result; the
+# libraries are already needed anyways, so they end up using almost
+# no additional memory.
+# There are a few exceptions such as 'less', which in 4.x is
+# rather large.
+progs sh # 36KB.
+ln sh -sh
+progs echo # 0KB.
+progs pwd
+progs mkdir rmdir
+progs chmod chown
+progs mv ln # 0KB.
+progs mount
+progs minigzip # 0KB.
+ln minigzip gzip
+progs cp # 0KB.
+progs rm
+progs ls
+progs kill
+progs df # 0KB.
+progs ps # 4KB.
+progs ns # 4KB.
+ln ns netstat
+progs vm # 0KB.
+progs cat # 0KB.
+progs test # 0KB.
+ln test [
+progs hostname # 0KB.
+progs login # 4KB.
+progs getty # 4KB.
+progs stty # 4KB.
+progs w # 0KB.
+progs msg # 0KB.
+ln msg dmesg
+progs kget # 0KB.
+progs reboot # 0KB.
+#progs less # 36KB
+#ln less more
+progs more # 12KB
+special more srcdir /usr/ports/picobsd/more
+
+progs sysctl
+progs swapon # 0KB.
+progs pwd_mkdb # 0KB.
+progs dev_mkdb # 0KB.
+progs umount
+progs mount_std
+progs du # 0KB.
+progs tail # 0KB.
+progs tee # 0KB.
+progs passwd # 0KB.
+
+progs route # 8KB
+# progs mount_msdos
+# progs comcontrol
+#
+# If you want to run natd, remember the alias library
+#progs natd # 20KB
+#libs -lalias	# natd
+#
+# ppp is rather large. Note that as of Jan.01, RELEASE_CRUNCH
+# makes ppp not use libalias, so you cannot have aliasing.
+#progs ppp # 112KB
+
+# You need an editor. ee is relatively small, though there are
+# smaller ones. vi is much larger.
+# The editor also usually need a curses library.
+progs ee # 32KB.
+libs -lncurses
+# progs vi # ??
+# libs -lcurses # for vi
+
+progs tcpdump # 100KB.
+special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump
+
+progs arp # 0KB.
+
+progs disklabel # 4KB.
+progs fdisk # 4KB.
+progs vnconfig # 0KB.
+
+progs grep # 16KB.
+progs date # 4KB.
+progs mount_nfs # 0KB.
+ln mount_nfs nfs
+progs ping # 4KB.
+#progs routed # 32KB.
+progs ipfw # 12KB.
+progs traceroute # 0KB.
+# progs mount_cd9660 # 4KB.
+# ln mount_cd9660 cd9660
+# progs newfs # 12KB.
+#ln newfs mount_mfs
+ln chown chgrp
+# ln mount_msdos msdos
+ln mount_std procfs
+ln mount_std mount_procfs
+
+# If you need to access the box remotely, and maybe copy files
+# from/to it, you can use telnet, rsh or ssh.
+# inetd is only needed for telnet and rshd
+progs inetd # 12KB.
+progs telnet # 20KB.
+progs telnetd # 12KB.
+#progs ftp # 28KB.
+#progs tar # 32KB.
+
+# Check the ssh license! If you want to use this,
+# go to /usr/ports/security/ssh-picobsd, do a make extract configure
+#progs sshd	# includes ssh and scp
+special sshd objvar SSHD_OBJS
+special sshd srcdir /usr/ports/picobsd/ssh-picobsd/work/ssh-1.2.27
+special sshd objdir /usr/ports/picobsd/ssh-picobsd/work/ssh-1.2.27
+
+### ee uses ncurses instead of curses
+libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
+libs -lmytinfo -lipx -lz -lpcap -lwrap
+libs -ltermcap -lgnuregex -ltelnet # -lcurses
diff --git a/release/picobsd/bridge/crunch1/crunch.conf b/release/picobsd/bridge/crunch1/crunch.conf
deleted file mode 100644
index 7b3845621c71..000000000000
--- a/release/picobsd/bridge/crunch1/crunch.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# $FreeBSD$
-#
-# NOTE: the string "/usr/src" will be automatically replaced with the
-# correct value set in 'build' script - you should change it there
-
-# Default build options.
-buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
-
-# other sources
-srcdirs /usr/src/bin
-srcdirs /usr/src/sbin/i386
-srcdirs /usr/src/sbin
-srcdirs /usr/src/usr.bin
-srcdirs /usr/src/gnu/usr.bin
-srcdirs /usr/src/usr.sbin
-srcdirs /usr/src/libexec
-# sources for ns & vm
-srcdirs ../../tinyware
-
-progs init # 4KB.
-progs fsck # 24KB.
-progs ifconfig # 4KB.
-progs sh # 36KB.
-ln sh -sh
-progs inetd # 12KB.
-progs df # 0KB.
-progs ps # 4KB.
-progs ns # 4KB.
-ln ns netstat
-progs vm # 0KB.
-progs cat # 0KB.
-progs test # 0KB.
-ln test [
-progs echo # 0KB.
-progs hostname # 0KB.
-progs ln # 0KB.
-progs login # 4KB.
-progs getty # 4KB.
-progs stty # 4KB.
-progs w # 0KB.
-progs msg # 0KB.
-ln msg dmesg
-progs kget # 0KB.
-progs reboot # 0KB.
-progs cp # 0KB. (strange!)
-progs rm
-progs mkdir
-progs rmdir
-progs ls
-progs chmod
-progs chown
-progs mv
-progs sysctl
-progs route
-progs swapon # 0KB.
-progs pwd_mkdb # 0KB.
-progs dev_mkdb # 0KB.
-progs mount
-progs umount
-# progs # mount_msdos umount #  comcontrol
-progs kill mount_std # natd
-
-progs minigzip # 0KB.
-ln minigzip gzip
-progs ee # 32KB.
-libs -lncurses
-progs tcpdump # 48KB.
-special tcpdump srcdir /usr/src/usr.sbin/tcpdump/tcpdump
-progs arp # 0KB.
-progs disklabel # 4KB.
-progs fdisk # 4KB.
-progs vnconfig # 0KB.
-progs du # 0KB.
-progs tail # 0KB.
-progs tee # 0KB.
-
-progs pwd less # pppd
-ln less more
-progs grep # 16KB.
-progs passwd # 0KB.
-progs date # 4KB.
-progs mount_nfs # 0KB.
-ln mount_nfs nfs
-progs ping # 4KB.
-progs routed # 28KB.
-progs ipfw # 12KB.
-progs traceroute # 0KB.
-# progs mount_cd9660 # 4KB.
-# ln mount_cd9660 cd9660
-# progs newfs # 12KB.
-#ln newfs mount_mfs
-ln chown chgrp
-# ln mount_msdos msdos
-ln mount_std procfs
-ln mount_std mount_procfs
-
-# you can either use telnet/telnetd, or ssh
-progs telnet # 20KB.
-progs telnetd # 12KB.
-#progs ftp # 28KB.
-#progs tar # 32KB.
-
-### Check the ssh license! If you want to use this,
-### go to /usr/ports/security/ssh, do a make extract configure
-#progs sshd
-#special sshd srcdir /usr/ports/security/ssh/work/ssh-1.2.27
-#special sshd objvar SSHD_OBJS
-#progs ssh
-#ln ssh ssh1
-#special ssh srcdir /usr/ports/security/ssh/work/ssh-1.2.27
-#special ssh objvar SSH_OBJS
-#progs scp
-#special scp srcdir /usr/ports/security/ssh/work/ssh-1.2.27
-#special scp objvar SCP_OBJS
-
-# progs vi # ??
-# libs -lcurses # for vi
-
-### ee uses ncurses instead of curses
-libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
-libs -lmytinfo -lipx -lz -lpcap -lalias -lwrap
-libs -ltermcap -lgnuregex -ltelnet # -lcurses
diff --git a/release/picobsd/bridge/lang/motd.en b/release/picobsd/bridge/lang/motd.en
deleted file mode 100644
index 23675879a00f..000000000000
--- a/release/picobsd/bridge/lang/motd.en
+++ /dev/null
@@ -1,9 +0,0 @@
-==================================================
-                                           )\_)\
-PicoBSD @VER@ (bridge)                     (o,o)
-                                        __  \~/
-Welcome to PicoBSD!                     -->====\
-                                        ~~  d d
-
-For more info contact the author (abial@freebsd.org).
-