source: build-files/freebsd-update/patches/9.1-RELEASE/3-GENERIC-VIMAGE @ 635dc54

9.2-releasereleng/10.0releng/10.0.1releng/10.0.2
Last change on this file since 635dc54 was 635dc54, checked in by Kris Moore <kris@…>, 13 months ago

Add our freebsd-update code to GIT

This will become a dumping ground for mods we may make to the freebsd-update
build process, as well as the specific patches we have going into a release

  • Property mode set to 100644
File size: 2.4 KB
Line 
1--- sys/i386/conf/GENERIC.old   2013-04-09 16:23:11.881436192 -0400
2+++ sys/i386/conf/GENERIC       2013-04-09 16:22:51.631437099 -0400
3@@ -67,6 +67,7 @@
4 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
5 options        KDB                     # Kernel debugger related code
6 options        KDB_TRACE               # Print a stack trace for a panic
7+options                VIMAGE                  # Enable virtual-networking for jails
8 
9 # To make an SMP kernel, the next two lines are needed
10 options        SMP                     # Symmetric MultiProcessor Kernel
11@@ -341,13 +342,13 @@
12 device         zyd             # ZyDAS zd1211/zd1211b wireless NICs
13 
14 # FireWire support
15-device         firewire        # FireWire bus code
16+#device                firewire        # FireWire bus code
17 # sbp(4) works for some systems but causes boot failure on others
18 #device                sbp             # SCSI over FireWire (Requires scbus and da)
19-device         fwe             # Ethernet over FireWire (non-standard!)
20-device         fwip            # IP over FireWire (RFC 2734,3146)
21-device         dcons           # Dumb console driver
22-device         dcons_crom      # Configuration ROM for dcons
23+#device                fwe             # Ethernet over FireWire (non-standard!)
24+#device                fwip            # IP over FireWire (RFC 2734,3146)
25+#device                dcons           # Dumb console driver
26+#device                dcons_crom      # Configuration ROM for dcons
27 
28 # Sound support
29 device         sound           # Generic sound driver (required)
30--- sys/amd64/conf/GENERIC.old  2013-04-09 16:20:35.361437927 -0400
31+++ sys/amd64/conf/GENERIC      2013-04-09 16:22:08.301434802 -0400
32@@ -67,6 +67,7 @@
33 options        INCLUDE_CONFIG_FILE     # Include this file in kernel
34 options        KDB                     # Kernel debugger related code
35 options        KDB_TRACE               # Print a stack trace for a panic
36+options                VIMAGE                  # Enable virtual-networking for jails
37 
38 # Make an SMP-capable kernel by default
39 options        SMP                     # Symmetric MultiProcessor Kernel
40@@ -328,13 +329,13 @@
41 device         zyd             # ZyDAS zd1211/zd1211b wireless NICs
42 
43 # FireWire support
44-device         firewire        # FireWire bus code
45+#device                firewire        # FireWire bus code
46 # sbp(4) works for some systems but causes boot failure on others
47 #device                sbp             # SCSI over FireWire (Requires scbus and da)
48-device         fwe             # Ethernet over FireWire (non-standard!)
49-device         fwip            # IP over FireWire (RFC 2734,3146)
50-device         dcons           # Dumb console driver
51-device         dcons_crom      # Configuration ROM for dcons
52+#device                fwe             # Ethernet over FireWire (non-standard!)
53+#device                fwip            # IP over FireWire (RFC 2734,3146)
54+#device                dcons           # Dumb console driver
55+#device                dcons_crom      # Configuration ROM for dcons
56 
57 # Sound support
58 device         sound           # Generic sound driver (required)
Note: See TracBrowser for help on using the repository browser.