diff --git a/tools/tools/tinybsd/conf/bridge/TINYBSD b/tools/tools/tinybsd/conf/bridge/TINYBSD index d1d22bb51639..63f7ca29a689 100644 --- a/tools/tools/tinybsd/conf/bridge/TINYBSD +++ b/tools/tools/tinybsd/conf/bridge/TINYBSD @@ -33,8 +33,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device eisa device pci @@ -65,9 +63,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -121,7 +116,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet @@ -137,8 +131,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device pty # Pseudo-ttys (telnet etc) @@ -151,12 +143,13 @@ device bpf # Berkeley packet filter options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT -options BRIDGE device ath device ath_hal device ath_rate_sample +device if_bridge #Bridge interface + # CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 # clock to actually be used. options CLK_USE_I8254_CALIBRATION diff --git a/tools/tools/tinybsd/conf/bridge/etc/rc.conf b/tools/tools/tinybsd/conf/bridge/etc/rc.conf index 2a585c1b882a..a3e638e5efd5 100644 --- a/tools/tools/tinybsd/conf/bridge/etc/rc.conf +++ b/tools/tools/tinybsd/conf/bridge/etc/rc.conf @@ -9,4 +9,9 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" +tmpmfs="YES" +# Bridge configuration +# Replace both ath0 and xl1 by your bridge interfaces +cloned_interfaces="bridge0" +ifconfig_bridge0="addm ath0 addm xl1 up" diff --git a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf b/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf index 82cc61f5a4c6..cb7084679fae 100644 --- a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf +++ b/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf @@ -1,8 +1,5 @@ # $FreeBSD$ # BRIDGE Options -net.link.ether.bridge.enable=1 -net.link.ether.bridge.ipfw=1 -net.link.ether.bridge.config==xl0:0,xl1:0,fxp0:1,fxp1:1 - - +net.link.bridge.ipfw=1 +net.link.bridge.pfil_onlyip=1 diff --git a/tools/tools/tinybsd/conf/default/TINYBSD b/tools/tools/tinybsd/conf/default/TINYBSD index 3d2599a06eb1..9d1b6a921fe8 100644 --- a/tools/tools/tinybsd/conf/default/TINYBSD +++ b/tools/tools/tinybsd/conf/default/TINYBSD @@ -39,8 +39,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device eisa device pci @@ -75,9 +73,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -131,7 +126,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet @@ -147,8 +141,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support #device sl # Kernel SLIP @@ -168,12 +160,13 @@ options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT options DUMMYNET -options BRIDGE device ath device ath_hal device ath_rate_sample +device if_bridge #Bridge interface + # CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 # clock to actually be used. options CLK_USE_I8254_CALIBRATION diff --git a/tools/tools/tinybsd/conf/default/etc/rc.conf b/tools/tools/tinybsd/conf/default/etc/rc.conf index 2a585c1b882a..a21476241081 100644 --- a/tools/tools/tinybsd/conf/default/etc/rc.conf +++ b/tools/tools/tinybsd/conf/default/etc/rc.conf @@ -9,4 +9,4 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" - +tmpmfs="YES" diff --git a/tools/tools/tinybsd/conf/firewall/TINYBSD b/tools/tools/tinybsd/conf/firewall/TINYBSD index 8d4cb9b75dc1..4c15a6cb33a0 100644 --- a/tools/tools/tinybsd/conf/firewall/TINYBSD +++ b/tools/tools/tinybsd/conf/firewall/TINYBSD @@ -32,8 +32,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device eisa device pci @@ -64,9 +62,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -120,7 +115,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet @@ -128,7 +122,7 @@ device xe # Xircom pccard Ethernet #device le # Wireless NIC cards -#device wlan # 802.11 support +device wlan # 802.11 support #device an # Aironet 4500/4800 802.11 wireless NICs. #device awi # BayStack 660 and others #device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. @@ -136,8 +130,6 @@ device xe # Xircom pccard Ethernet # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device pty # Pseudo-ttys (telnet etc) diff --git a/tools/tools/tinybsd/conf/firewall/etc/rc.conf b/tools/tools/tinybsd/conf/firewall/etc/rc.conf index 1631ede18665..d00fe837797f 100644 --- a/tools/tools/tinybsd/conf/firewall/etc/rc.conf +++ b/tools/tools/tinybsd/conf/firewall/etc/rc.conf @@ -9,6 +9,7 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" +tmpmfs="YES" # IPFW firewall_enable="YES" diff --git a/tools/tools/tinybsd/conf/minimal/TINYBSD b/tools/tools/tinybsd/conf/minimal/TINYBSD index ff425b8f9170..0ef5706b679e 100644 --- a/tools/tools/tinybsd/conf/minimal/TINYBSD +++ b/tools/tools/tinybsd/conf/minimal/TINYBSD @@ -32,8 +32,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device pci # ATA and ATAPI devices @@ -60,9 +58,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -70,8 +65,6 @@ device pmtimer # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device pty # Pseudo-ttys (telnet etc) @@ -87,3 +80,4 @@ options CPU_SOEKRIS options CPU_ELAN_XTAL=32768000 options CPU_ELAN_PPS +device bpf diff --git a/tools/tools/tinybsd/conf/minimal/etc/rc.conf b/tools/tools/tinybsd/conf/minimal/etc/rc.conf index 2a585c1b882a..a21476241081 100644 --- a/tools/tools/tinybsd/conf/minimal/etc/rc.conf +++ b/tools/tools/tinybsd/conf/minimal/etc/rc.conf @@ -9,4 +9,4 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" - +tmpmfs="YES" diff --git a/tools/tools/tinybsd/conf/vpn/TINYBSD b/tools/tools/tinybsd/conf/vpn/TINYBSD index 00e5830b335e..57bc1984c476 100644 --- a/tools/tools/tinybsd/conf/vpn/TINYBSD +++ b/tools/tools/tinybsd/conf/vpn/TINYBSD @@ -32,8 +32,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device eisa device pci @@ -65,9 +63,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -121,7 +116,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet @@ -137,8 +131,6 @@ device xe # Xircom pccard Ethernet # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support #device sl # Kernel SLIP diff --git a/tools/tools/tinybsd/conf/vpn/etc/rc.conf b/tools/tools/tinybsd/conf/vpn/etc/rc.conf index 7a3a7e2c6ac3..cb0af9ffa6c8 100644 --- a/tools/tools/tinybsd/conf/vpn/etc/rc.conf +++ b/tools/tools/tinybsd/conf/vpn/etc/rc.conf @@ -9,13 +9,14 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" +tmpmfs="YES" # VPN ipsec_enable="YES" ipsec_file="/etc/ipsec.conf" -# CONF +# Set here your VPN configuration +gif_interfaces="gif0" ifconfig_gif0="inet 192.168.1.1 192.168.2.1 netmask 0xffffffff" static_routes="vpn" route_vpn="192.168.2.0 192.168.2.1 netmask 0xffffff00" - diff --git a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles b/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles index 129256ba3239..8a307b1983ec 100644 --- a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles +++ b/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles @@ -84,6 +84,7 @@ sbin/nos-tun sbin/ping sbin/rcorder sbin/route +sbin/setkey sbin/shutdown sbin/slattach sbin/swapon @@ -204,7 +205,6 @@ usr/sbin/ntpdate usr/sbin/pciconf usr/sbin/pw usr/sbin/pwd_mkdb -usr/sbin/setkey usr/sbin/slstat usr/sbin/sshd usr/sbin/syslogd diff --git a/tools/tools/tinybsd/conf/wireless/TINYBSD b/tools/tools/tinybsd/conf/wireless/TINYBSD index e819aa1f9c71..4966b8266139 100644 --- a/tools/tools/tinybsd/conf/wireless/TINYBSD +++ b/tools/tools/tinybsd/conf/wireless/TINYBSD @@ -32,8 +32,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device eisa device pci @@ -65,9 +63,6 @@ device sc device agp # support several AGP chipsets -# Floating point support - do not disable. -device npx - # Power management support (see NOTES for more options) #device apm # Add suspend/resume support for the i8254. @@ -142,8 +137,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device pty # Pseudo-ttys (telnet etc) @@ -158,7 +151,6 @@ options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT options DUMMYNET -options BRIDGE device pf #PF OpenBSD packet-filter firewall device pflog #logging support interface for PF @@ -168,6 +160,8 @@ device ath device ath_hal device ath_rate_sample +device if_bridge + # CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 # clock to actually be used. options CLK_USE_I8254_CALIBRATION diff --git a/tools/tools/tinybsd/conf/wireless/etc/rc.conf b/tools/tools/tinybsd/conf/wireless/etc/rc.conf index 36936d92ef02..18c3586b38ac 100644 --- a/tools/tools/tinybsd/conf/wireless/etc/rc.conf +++ b/tools/tools/tinybsd/conf/wireless/etc/rc.conf @@ -9,6 +9,7 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" +tmpmfs="YES" # IPFW firewall_enable="YES" diff --git a/tools/tools/tinybsd/conf/wrap/TINYBSD b/tools/tools/tinybsd/conf/wrap/TINYBSD index f3debf66defb..238a4b618284 100644 --- a/tools/tools/tinybsd/conf/wrap/TINYBSD +++ b/tools/tools/tinybsd/conf/wrap/TINYBSD @@ -35,8 +35,6 @@ options ADAPTIVE_GIANT # Giant mutex is adaptive. #device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa device pci # ATA and ATAPI devices @@ -44,9 +42,6 @@ device ata device atadisk # ATA disk drives options ATA_STATIC_ID # Static device numbering -# Floating point support - do not disable. -device npx - # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports @@ -89,7 +84,6 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet @@ -109,8 +103,6 @@ device ath_rate_sample # Pseudo devices. device loop # Network loopback -device mem # Memory and kernel memory devices -device io # I/O device device random # Entropy device device ether # Ethernet support device ppp # Kernel PPP @@ -131,7 +123,6 @@ options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT options DUMMYNET -options BRIDGE options ALTQ options ALTQ_CBQ @@ -145,5 +136,6 @@ device pf device pflog device pfsync device carp +device if_bridge options DEVICE_POLLING diff --git a/tools/tools/tinybsd/conf/wrap/etc/rc.conf b/tools/tools/tinybsd/conf/wrap/etc/rc.conf index 2a585c1b882a..a21476241081 100644 --- a/tools/tools/tinybsd/conf/wrap/etc/rc.conf +++ b/tools/tools/tinybsd/conf/wrap/etc/rc.conf @@ -9,4 +9,4 @@ update_motd="NO" varmfs="YES" populate_var="YES" varsize="8192" - +tmpmfs="YES"