| 1 |
--- a/sys/amd64/conf/GENERIC
|
| 2 |
+++ b/sys/amd64/conf/GENERIC
|
| 3 |
@@ -18,11 +18,11 @@
|
| 4 |
#
|
| 5 |
# $FreeBSD$
|
| 6 |
|
| 7 |
-cpu HAMMER
|
| 8 |
-ident GENERIC
|
| 9 |
+#cpu HAMMER
|
| 10 |
+#ident GENERIC
|
| 11 |
|
| 12 |
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
|
| 13 |
-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
|
| 14 |
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
|
| 15 |
+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
|
| 16 |
|
| 17 |
options SCHED_ULE # ULE scheduler
|
| 18 |
options PREEMPTION # Enable kernel thread preemption
|
| 19 |
@@ -52,7 +52,7 @@
|
| 20 |
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
|
| 21 |
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
|
| 22 |
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
|
| 23 |
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
|
| 24 |
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
|
| 25 |
options KTRACE # ktrace(1) support
|
| 26 |
options STACK # stack(9) support
|
| 27 |
options SYSVSHM # SYSV-style shared memory
|
| 28 |
@@ -71,9 +71,9 @@
|
| 29 |
options CAPABILITY_MODE # Capsicum capability mode
|
| 30 |
options CAPABILITIES # Capsicum capabilities
|
| 31 |
options MAC # TrustedBSD MAC Framework
|
| 32 |
-options KDTRACE_FRAME # Ensure frames are compiled in
|
| 33 |
-options KDTRACE_HOOKS # Kernel DTrace hooks
|
| 34 |
-options DDB_CTF # Kernel ELF linker loads CTF data
|
| 35 |
+#options KDTRACE_FRAME # Ensure frames are compiled in
|
| 36 |
+#options KDTRACE_HOOKS # Kernel DTrace hooks
|
| 37 |
+#options DDB_CTF # Kernel ELF linker loads CTF data
|
| 38 |
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
| 39 |
|
| 40 |
# Debugging support. Always need this:
|
| 41 |
@@ -100,9 +100,6 @@
|
| 42 |
device acpi
|
| 43 |
device pci
|
| 44 |
|
| 45 |
-# Floppy drives
|
| 46 |
-device fdc
|
| 47 |
-
|
| 48 |
# ATA controllers
|
| 49 |
device ahci # AHCI-compatible SATA controllers
|
| 50 |
device ata # Legacy ATA/SATA controllers
|
| 51 |
@@ -199,10 +196,6 @@
|
| 52 |
# Parallel port
|
| 53 |
device ppc
|
| 54 |
device ppbus # Parallel port bus (required)
|
| 55 |
-device lpt # Printer
|
| 56 |
-device plip # TCP/IP over parallel
|
| 57 |
-device ppi # Parallel port interface device
|
| 58 |
-#device vpo # Requires scbus and da
|
| 59 |
|
| 60 |
device puc # Multi I/O cards and multi-channel UARTs
|
| 61 |
|
| 62 |
@@ -298,10 +291,7 @@
|
| 63 |
device random # Entropy device
|
| 64 |
device ether # Ethernet support
|
| 65 |
device vlan # 802.1Q VLAN support
|
| 66 |
-device tun # Packet tunnel.
|
| 67 |
device md # Memory "disks"
|
| 68 |
-device gif # IPv6 and IPv4 tunneling
|
| 69 |
-device faith # IPv6-to-IPv4 relaying (translation)
|
| 70 |
device firmware # firmware assist module
|
| 71 |
|
| 72 |
# The `bpf' device enables the Berkeley Packet Filter.
|
| 73 |
--- a/sys/i386/conf/GENERIC
|
| 74 |
+++ b/sys/i386/conf/GENERIC
|
| 75 |
@@ -18,13 +18,13 @@
|
| 76 |
#
|
| 77 |
# $FreeBSD$
|
| 78 |
|
| 79 |
-cpu I486_CPU
|
| 80 |
-cpu I586_CPU
|
| 81 |
-cpu I686_CPU
|
| 82 |
-ident GENERIC
|
| 83 |
+#cpu I486_CPU
|
| 84 |
+#cpu I586_CPU
|
| 85 |
+#cpu I686_CPU
|
| 86 |
+#ident GENERIC
|
| 87 |
|
| 88 |
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
|
| 89 |
-makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
|
| 90 |
+#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
|
| 91 |
+#makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
|
| 92 |
|
| 93 |
options SCHED_ULE # ULE scheduler
|
| 94 |
options PREEMPTION # Enable kernel thread preemption
|
| 95 |
@@ -45,6 +45,8 @@
|
| 96 |
options MSDOSFS # MSDOS Filesystem
|
| 97 |
options CD9660 # ISO 9660 Filesystem
|
| 98 |
options PROCFS # Process filesystem (requires PSEUDOFS)
|
| 99 |
+options LINPROCFS
|
| 100 |
+options COMPAT_LINUX # Needed by LINPROCFS
|
| 101 |
options PSEUDOFS # Pseudo-filesystem framework
|
| 102 |
options GEOM_PART_GPT # GUID Partition Tables.
|
| 103 |
options GEOM_RAID # Soft RAID functionality.
|
| 104 |
@@ -53,7 +55,7 @@
|
| 105 |
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
|
| 106 |
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
|
| 107 |
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
|
| 108 |
-options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
|
| 109 |
+options SCSI_DELAY=2000 # Delay (in ms) before probing SCSI
|
| 110 |
options KTRACE # ktrace(1) support
|
| 111 |
options STACK # stack(9) support
|
| 112 |
options SYSVSHM # SYSV-style shared memory
|
| 113 |
@@ -72,8 +74,8 @@
|
| 114 |
options CAPABILITY_MODE # Capsicum capability mode
|
| 115 |
options CAPABILITIES # Capsicum capabilities
|
| 116 |
options MAC # TrustedBSD MAC Framework
|
| 117 |
-options KDTRACE_HOOKS # Kernel DTrace hooks
|
| 118 |
-options DDB_CTF # Kernel ELF linker loads CTF data
|
| 119 |
+#options KDTRACE_HOOKS # Kernel DTrace hooks
|
| 120 |
+#options DDB_CTF # Kernel ELF linker loads CTF data
|
| 121 |
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
| 122 |
|
| 123 |
# Debugging support. Always need this:
|
| 124 |
@@ -102,9 +104,6 @@
|
| 125 |
device eisa
|
| 126 |
device pci
|
| 127 |
|
| 128 |
-# Floppy drives
|
| 129 |
-device fdc
|
| 130 |
-
|
| 131 |
# ATA controllers
|
| 132 |
device ahci # AHCI-compatible SATA controllers
|
| 133 |
device ata # Legacy ATA/SATA controllers
|
| 134 |
@@ -209,10 +208,6 @@
|
| 135 |
# Parallel port
|
| 136 |
device ppc
|
| 137 |
device ppbus # Parallel port bus (required)
|
| 138 |
-device lpt # Printer
|
| 139 |
-device plip # TCP/IP over parallel
|
| 140 |
-device ppi # Parallel port interface device
|
| 141 |
-#device vpo # Requires scbus and da
|
| 142 |
|
| 143 |
device puc # Multi I/O cards and multi-channel UARTs
|
| 144 |
|
| 145 |
@@ -311,10 +306,7 @@
|
| 146 |
device random # Entropy device
|
| 147 |
device ether # Ethernet support
|
| 148 |
device vlan # 802.1Q VLAN support
|
| 149 |
-device tun # Packet tunnel.
|
| 150 |
device md # Memory "disks"
|
| 151 |
-device gif # IPv6 and IPv4 tunneling
|
| 152 |
-device faith # IPv6-to-IPv4 relaying (translation)
|
| 153 |
device firmware # firmware assist module
|
| 154 |
|
| 155 |
# The `bpf' device enables the Berkeley Packet Filter.
|
| 156 |
--- /dev/null
|
| 157 |
+++ b/sys/conf/DEBIAN
|
| 158 |
@@ -0,0 +1,52 @@
|
| 159 |
+# Common options to all Debian GNU/kFreeBSD kernels
|
| 160 |
+
|
| 161 |
+options LINPROCFS
|
| 162 |
+options LINSYSFS
|
| 163 |
+options FDESCFS
|
| 164 |
+options TMPFS
|
| 165 |
+options QUOTA
|
| 166 |
+options KTRACE
|
| 167 |
+
|
| 168 |
+# Network options
|
| 169 |
+device carp
|
| 170 |
+device pf
|
| 171 |
+device pfsync
|
| 172 |
+device pflog
|
| 173 |
+
|
| 174 |
+# pty(4) was removed from GENERIC in 10-CURRENT (see rev 233271),
|
| 175 |
+# but unfortunetely glibc doesn't support pts(4) yet (see #667448).
|
| 176 |
+device pty
|
| 177 |
+
|
| 178 |
+# Full debugger support is disabled by upstream when a branch is close to
|
| 179 |
+# release. Unfortunately this can trigger the appearance of heisenbugs
|
| 180 |
+# which were previously hidden (we've been hit by this already, see #651624).
|
| 181 |
+#
|
| 182 |
+# This disables full debugger support in advance, so that the build
|
| 183 |
+# configuration which is going to be used for release is tested during the
|
| 184 |
+# whole release cycle. If you need a debug kernel, simply remove/comment
|
| 185 |
+# the following lines:
|
| 186 |
+
|
| 187 |
+nooption DDB # Support DDB.
|
| 188 |
+nooption GDB # Support remote GDB.
|
| 189 |
+nooption DEADLKRES # Enable the deadlock resolver
|
| 190 |
+nooption INVARIANTS # Enable calls of extra sanity checking
|
| 191 |
+nooption INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS
|
| 192 |
+nooption WITNESS # Enable checks to detect deadlocks and cycles
|
| 193 |
+nooption WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
|
| 194 |
+nooption MALLOC_DEBUG_MAXZONES # Separate malloc(9) zones
|
| 195 |
+
|
| 196 |
+# Usually when full debugger is enabled, minimum debugger support is disabled.
|
| 197 |
+# Bring it back:
|
| 198 |
+
|
| 199 |
+options KDB_TRACE # Print a stack trace for a panic.
|
| 200 |
+
|
| 201 |
+# Alternate queueing
|
| 202 |
+options ALTQ
|
| 203 |
+options ALTQ_CBQ # Class Bases Queuing (CBQ)
|
| 204 |
+options ALTQ_RED # Random Early Detection (RED)
|
| 205 |
+options ALTQ_RIO # RED In/Out
|
| 206 |
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
|
| 207 |
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
|
| 208 |
+
|
| 209 |
+# Disable binary blobs
|
| 210 |
+include WITHOUT_SOURCELESS
|
Parent Directory
| 
Revision Log