nrelease: Sync the LiveDVD kernels with some recent changes.

diff --git a/nrelease/gui/root/DFLYLIVE b/nrelease/gui/root/DFLYLIVE
index a8be595..41c4501 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE
+++ b/nrelease/gui/root/DFLYLIVE
@@ -50,7 +50,7 @@ options       ICMP_BANDLIM            #Rate limit bad replies
 options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
 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 
+options        AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
                                        # output.  Adds ~215k to driver.
 
 # To make an SMP kernel both SMP and APIC_IO are usually
@@ -101,6 +101,15 @@ device             fd1     at fdc0 drive 1
 # don't use the above line for fdc0 but the following one:
 #device                fdc0
 
+# AHCI driver, this will override NATA for AHCI devices,
+# both drivers may be included.
+#
+device         ahci
+
+# Sil3124/3132/3531 driver
+#
+device         sili
+
 # NEW-ATA (NATA) and ATAPI devices
 #
 device         nata
@@ -224,18 +233,23 @@ device            ppi             # Parallel port interface device
 
 # PCI Ethernet NICs.
 device         de              # DEC/Intel DC21x4x (``Tulip'')
-device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
 device         txp             # 3Com 3cR990 (``Typhoon'')
 device         vx              # 3Com 3c590, 3c595 (``Vortex'')
 
+device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
+                               # Requires ig_hal
+device         ig_hal          # Intel PRO/1000 hardware abstraction layer
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device         miibus          # MII bus support
+device         ale             # Atheros AR8121/AR8113/AR8114
 device         bce             # Broadcom NetXtreme II Gigabit Ethernet
 device         bfe             # Broadcom BCM440x 10/100 Ethernet
 device         dc              # DEC/Intel 21143 and various workalikes
 device         et              # Agere ET1310 10/100/1000 Ethernet
 device         fxp             # Intel EtherExpress PRO/100B (82557, 82558)
+device         jme             # JMicron Gigabit/Fast Ethernet
 device         pcn             # AMD Am79C97x PCI 10/100 NICs
 device         rl              # RealTek 8129/8139
 device         re              # RealTek 8139C+/8169

diff --git a/nrelease/gui/root/DFLYLIVE-SMP b/nrelease/gui/root/DFLYLIVE-SMP
index e8f83a7..4f64c85 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE-SMP
+++ b/nrelease/gui/root/DFLYLIVE-SMP
@@ -9,6 +9,8 @@
 platform       pc32
 machine                i386
 machine_arch   i386
+cpu            I486_CPU
+cpu            I586_CPU
 cpu            I686_CPU
 ident          DFLYLIVE-SMP
 maxusers       0
@@ -48,7 +50,7 @@ options       ICMP_BANDLIM            #Rate limit bad replies
 options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
 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 
+options        AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
                                        # output.  Adds ~215k to driver.
 
 # To make an SMP kernel both SMP and APIC_IO are usually
@@ -99,6 +101,15 @@ device              fd1     at fdc0 drive 1
 # don't use the above line for fdc0 but the following one:
 #device                fdc0
 
+# AHCI driver, this will override NATA for AHCI devices,
+# both drivers may be included.
+#
+device         ahci
+
+# Sil3124/3132/3531 driver
+#
+device         sili
+
 # NEW-ATA (NATA) and ATAPI devices
 #
 device         nata
@@ -222,18 +233,23 @@ device            ppi             # Parallel port interface device
 
 # PCI Ethernet NICs.
 device         de              # DEC/Intel DC21x4x (``Tulip'')
-device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
 device         txp             # 3Com 3cR990 (``Typhoon'')
 device         vx              # 3Com 3c590, 3c595 (``Vortex'')
 
+device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
+                               # Requires ig_hal
+device         ig_hal          # Intel PRO/1000 hardware abstraction layer
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device         miibus          # MII bus support
+device         ale             # Atheros AR8121/AR8113/AR8114
 device         bce             # Broadcom NetXtreme II Gigabit Ethernet
 device         bfe             # Broadcom BCM440x 10/100 Ethernet
 device         dc              # DEC/Intel 21143 and various workalikes
 device         et              # Agere ET1310 10/100/1000 Ethernet
 device         fxp             # Intel EtherExpress PRO/100B (82557, 82558)
+device         jme             # JMicron Gigabit/Fast Ethernet
 device         pcn             # AMD Am79C97x PCI 10/100 NICs
 device         rl              # RealTek 8129/8139
 device         re              # RealTek 8139C+/8169

diff --git a/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC b/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
index 688f2d9..7d6ebd5 100644 (file)
--- a/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
+++ b/nrelease/gui/root/DFLYLIVE-SMP-NOAPIC
@@ -9,6 +9,8 @@
 platform       pc32
 machine                i386
 machine_arch   i386
+cpu            I486_CPU
+cpu            I586_CPU
 cpu            I686_CPU
 ident          DFLYLIVE-SMP-NOAPIC
 maxusers       0
@@ -48,7 +50,7 @@ options       ICMP_BANDLIM            #Rate limit bad replies
 options        KBD_INSTALL_CDEV        # install a CDEV entry in /dev
 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 
+options        AHD_REG_PRETTY_PRINT    # Print register bitfields in debug
                                        # output.  Adds ~215k to driver.
 
 # To make an SMP kernel both SMP and APIC_IO are usually
@@ -99,6 +101,15 @@ device              fd1     at fdc0 drive 1
 # don't use the above line for fdc0 but the following one:
 #device                fdc0
 
+# AHCI driver, this will override NATA for AHCI devices,
+# both drivers may be included.
+#
+device         ahci
+
+# Sil3124/3132/3531 driver
+#
+device         sili
+
 # NEW-ATA (NATA) and ATAPI devices
 #
 device         nata
@@ -222,18 +233,23 @@ device            ppi             # Parallel port interface device
 
 # PCI Ethernet NICs.
 device         de              # DEC/Intel DC21x4x (``Tulip'')
-device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
 device         txp             # 3Com 3cR990 (``Typhoon'')
 device         vx              # 3Com 3c590, 3c595 (``Vortex'')
 
+device         em              # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
+                               # Requires ig_hal
+device         ig_hal          # Intel PRO/1000 hardware abstraction layer
+
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device         miibus          # MII bus support
+device         ale             # Atheros AR8121/AR8113/AR8114
 device         bce             # Broadcom NetXtreme II Gigabit Ethernet
 device         bfe             # Broadcom BCM440x 10/100 Ethernet
 device         dc              # DEC/Intel 21143 and various workalikes
 device         et              # Agere ET1310 10/100/1000 Ethernet
 device         fxp             # Intel EtherExpress PRO/100B (82557, 82558)
+device         jme             # JMicron Gigabit/Fast Ethernet
 device         pcn             # AMD Am79C97x PCI 10/100 NICs
 device         rl              # RealTek 8129/8139
 device         re              # RealTek 8139C+/8169

diff --git a/nrelease/gui/root/VKERNEL b/nrelease/gui/root/VKERNEL
index ee4a8e4..9ab6b00 100644 (file)
--- a/nrelease/gui/root/VKERNEL
+++ b/nrelease/gui/root/VKERNEL
@@ -26,14 +26,25 @@ options         IPFIREWALL              #firewall
 options                IPFIREWALL_FORWARD      #enable transparent proxy support
 options                IPFIREWALL_DEFAULT_TO_ACCEPT    #allow everything by default
 
+# ALTQ
+options         ALTQ            #alternate queueing
+options         ALTQ_CBQ        #class based queueing
+options         ALTQ_RED        #random early detection
+options         ALTQ_RIO        #triple red for diffserv (needs RED)
+options         ALTQ_HFSC       #hierarchical fair service curve
+options         ALTQ_PRIQ       #priority queue
+options                ALTQ_FAIRQ      #fair queue
+#options        ALTQ_NOPCC      #don't use processor cycle counter
+options         ALTQ_DEBUG      #for debugging
+
 options                IPSEC                   #IP security
 options                IPSEC_ESP               #IP security (crypto; define w/ IPSEC)
 options                IPSEC_DEBUG             #debug for IP security
 
+options                HAMMER
 options                EXT2FS
 options        INET                    #InterNETworking
 options        INET6                   #IPv6 communications protocols
-options        HAMMER                  #Hammer Filesystem
 options        FFS                     #Berkeley Fast Filesystem
 options        FFS_ROOT                #FFS usable as root device [keep this!]
 options        SOFTUPDATES             #Enable FFS soft updates support
@@ -65,6 +76,8 @@ options       DDB
 options        DDB_TRACE
 options        INVARIANTS
 
+#options       CARP
+
 # Floating point support - do not disable.
 device         npx0    at nexus?
 
@@ -79,6 +92,8 @@ pseudo-device md              # Memory "disks"
 pseudo-device  gif             # IPv6 and IPv4 tunneling
 pseudo-device  faith   1       # IPv6-to-IPv4 relaying (translation)
 
+#pseudo-device carp
+
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 pseudo-device  bpf             #Berkeley packet filter
@@ -88,4 +103,5 @@ pseudo-device        bpf             #Berkeley packet filter
 device         vn
 device         vkd
 device         vke
+
 device         vcd