Код: Выделить всё
#diff GENERIC bshark.22-01-2007
19c19
< # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.13 2006/10/09 18:41:36 simon Exp $
---
> # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.413.2.13 2005/04/02 16:37:58 scottl Exp $
25c25
< ident GENERIC
---
> ident bshark221107
30,31c30,33
< makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
<
---
> options IPFIREWALL
> options IPFIREWALL_DEFAULT_TO_ACCEPT
> options IPDIVERT
> options DUMMYNET
33d34
< options PREEMPTION # Enable kernel thread preemption
35c36
< options INET6 # IPv6 communications protocols
---
> # options INET6 # IPv6 communications protocols
41,43c42,44
< options NFSCLIENT # Network Filesystem Client
< options NFSSERVER # Network Filesystem Server
< options NFS_ROOT # NFS usable as /, requires NFSCLIENT
---
> # options NFSCLIENT # Network Filesystem Client
> # options NFSSERVER # Network Filesystem Server
> # options NFS_ROOT # NFS usable as /, requires NFSCLIENT
51,52c52
< options COMPAT_FREEBSD5 # Compatible with FreeBSD5
< options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
---
> # options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
58a59,62
> options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
> # output. Adds ~128k to driver.
> options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
> # output. Adds ~215k to driver.
63c67,68
< # Bus support.
---
> # Bus support. Do not remove isa, even if you have no isa slots
> device isa
80,103c85,103
< device ahb # EISA AHA1742 family
< device ahc # AHA2940 and onboard AIC7xxx devices
< options AHC_REG_PRETTY_PRINT # Print register bitfields in debug
< # output. Adds ~128k to driver.
< device ahd # AHA39320/29320 and onboard AIC79xx devices
< options AHD_REG_PRETTY_PRINT # Print register bitfields in debug
< # output. Adds ~215k to driver.
< device amd # AMD 53C974 (Tekram DC-390(T))
< device isp # Qlogic family
< #device ispfw # Firmware for QLogic HBAs- normally a module
< device mpt # LSI-Logic MPT-Fusion
< #device ncr # NCR/Symbios Logic
< device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
< device trm # Tekram DC395U/UW/F DC315U adapters
<
< device adv # Advansys SCSI adapters
< device adw # Advansys wide SCSI adapters
< device aha # Adaptec 154x SCSI adapters
< device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
< device bt # Buslogic/Mylex MultiMaster SCSI adapters
<
< device ncv # NCR 53C500
< device nsp # Workbit Ninja SCSI-3
< device stg # TMC 18C30/18C50
---
> # device ahb # EISA AHA1742 family
> # device ahc # AHA2940 and onboard AIC7xxx devices
> # device ahd # AHA39320/29320 and onboard AIC79xx devices
> # device amd # AMD 53C974 (Tekram DC-390(T))
> # device isp # Qlogic family
> # device mpt # LSI-Logic MPT-Fusion
> # device ncr # NCR/Symbios Logic
> # device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
> # device trm # Tekram DC395U/UW/F DC315U adapters
>
> # device adv # Advansys SCSI adapters
> # device adw # Advansys wide SCSI adapters
> # device aha # Adaptec 154x SCSI adapters
> # device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
> # device bt # Buslogic/Mylex MultiMaster SCSI adapters
>
> # device ncv # NCR 53C500
> # device nsp # Workbit Ninja SCSI-3
> # device stg # TMC 18C30/18C50
121d120
< device rr232x # Highpoint RocketRAID 232x
131d129
< device mfi # LSI MegaRAID SAS
141,142d138
< device kbdmux # keyboard multiplexer
<
156a153,155
> # Floating point support - do not disable.
> device npx
>
182c181
< #device puc
---
> #device puc
194,197c193,195
< device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
< device bfe # Broadcom BCM440x 10/100 Ethernet
< device bge # Broadcom BCM570xx Gigabit Ethernet
< device dc # DEC/Intel 21143 and various workalikes
---
> # device bfe # Broadcom BCM440x 10/100 Ethernet
> # device bge # Broadcom BCM570xx Gigabit Ethernet
> # device dc # DEC/Intel 21143 and various workalikes
199,202c197,199
< device lge # Level 1 LXT1001 gigabit Ethernet
< device nge # NatSemi DP83820 gigabit Ethernet
< device nve # nVidia nForce MCP on-board Ethernet Networking
< device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc')
---
> # device lge # Level 1 LXT1001 gigabit ethernet
> # device nge # NatSemi DP83820 gigabit ethernet
> # device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc')
206,215c203,211
< device sis # Silicon Integrated Systems SiS 900/SiS 7016
< device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
< device ste # Sundance ST201 (D-Link DFE-550TX)
< device stge # Sundance/Tamarack TC9021 gigabit Ethernet
< device ti # Alteon Networks Tigon I/II gigabit Ethernet
< device tl # Texas Instruments ThunderLAN
< device tx # SMC EtherPower II (83c170 ``EPIC'')
< device vge # VIA VT612x gigabit Ethernet
< device vr # VIA Rhine, Rhine II
< device wb # Winbond W89C840F
---
> # device sis # Silicon Integrated Systems SiS 900/SiS 7016
> # device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
> # device ste # Sundance ST201 (D-Link DFE-550TX)
> # device ti # Alteon Networks Tigon I/II gigabit Ethernet
> # device tl # Texas Instruments ThunderLAN
> # device tx # SMC EtherPower II (83c170 ``EPIC'')
> # device vge # VIA VT612x gigabit ethernet
> # device vr # VIA Rhine, Rhine II
> # device wb # Winbond W89C840F
221,228c217,227
< device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
< 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
---
> # device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards
> # 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
>
> # ISA devices that use the old ISA shims
> #device le
232,234d230
< device wlan_wep # 802.11 WEP support
< device wlan_ccmp # 802.11 CCMP support
< device wlan_tkip # 802.11 TKIP support
236,238d231
< device ath # Atheros pci/cardbus NIC's
< device ath_hal # Atheros HAL (Hardware Access Layer)
< device ath_rate_sample # SampleRate tx rate control for ath
240d232
< device ral # Ralink Technology RT2500 wireless NICs.
245a238,239
> device mem # Memory and kernel memory devices
> device io # I/O device
264c258
< device ehci # EHCI PCI->USB interface (USB 2.0)
---
> #device ehci # EHCI PCI->USB interface (USB 2.0)
273d266
< device ural # Ralink Technology RT2500USB wireless NICs
276c269
< # USB Ethernet, requires miibus
---
> # USB Ethernet, requires mii
Версия, что ядро по глупости я не установил тоже не очень подошла:
Код: Выделить всё
# uname -a
FreeBSD 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Fri Nov 23 03:21:13 MSK 2007 scorro@:/usr/obj/usr/src/sys/bshark.22-11-2007 i386