Module Name: src
Committed By: pgoyette
Date: Tue May 5 22:14:24 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOMU
src/sys/arch/i386/conf: XEN3_DOMU
Log Message:
For non-modular XEN3_DOMU kernels, include sysmon and all of its
subcomponents. While the wdog and envsys subcomponents aren't
terribly useful in DOMU environment, this restores functionality
to previous (pre-modularized sysmon) state.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/i386/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.60 src/sys/arch/amd64/conf/XEN3_DOMU:1.61
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.60 Sun Nov 16 16:01:40 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Tue May 5 22:14:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.60 2014/11/16 16:01:40 manu Exp $
+# $NetBSD: XEN3_DOMU,v 1.61 2015/05/05 22:14:24 pgoyette Exp $
include "arch/amd64/conf/std.xen"
@@ -144,6 +144,12 @@ options IPFILTER_COMPAT # Compat for IP
#options ALTQ_RIO # RED with IN/OUT
#options ALTQ_WFQ # Weighted Fair Queueing
+# pseudo-device support for sysmon and its sub-components
+options SYSMON_POWER
+options SYSMON_ENVSYS
+options SYSMON_WDOG
+options SYSMON_TASKQ
+
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
#options NFS_BOOT_BOOTSTATIC
#options NFS_BOOTSTATIC_MYIP="\"169.254.1.2\""
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.65 src/sys/arch/i386/conf/XEN3_DOMU:1.66
--- src/sys/arch/i386/conf/XEN3_DOMU:1.65 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Tue May 5 22:14:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.65 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: XEN3_DOMU,v 1.66 2015/05/05 22:14:24 pgoyette Exp $
include "arch/xen/conf/std.xen"
@@ -149,6 +149,12 @@ options IPFILTER_COMPAT # Compat for IP
#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+# pseudo-device support for sysmon and its sub-components
+options SYSMON_POWER
+options SYSMON_ENVSYS
+options SYSMON_WDOG
+options SYSMON_TASKQ
+
#options ALTQ # Manipulate network interfaces' output queues
#options ALTQ_BLUE # Stochastic Fair Blue
#options ALTQ_CBQ # Class-Based Queueing
