From: Alexander Dahl <post@lespocky.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 7/8] net-snmp: reorder menu entries (menus on top)
Date: Fri, 20 Sep 2013 15:59:34 +0200 [thread overview]
Message-ID: <1379685575-11135-8-git-send-email-post@lespocky.de> (raw)
In-Reply-To: <1379685575-11135-1-git-send-email-post@lespocky.de>
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/net-snmp.in | 187 +++++++++++++++++++++++++++--------------------------
1 file changed, 94 insertions(+), 93 deletions(-)
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 6346711..d3d1524 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -10,22 +10,57 @@ menuconfig NET_SNMP
if NET_SNMP
-config NET_SNMP_MINI_AGENT
- bool
- default y
- prompt "minimal agent"
+menu "additional mib modules "
-config NET_SNMP_AGENT
+config NET_SNMP_MIB_MODULES_AGENTX
+ prompt "agentx"
bool
- prompt "agent (snmpd)"
+ help
+ AgentX support (includes both agentx/master and agentx/client).
-config NET_SNMP_APPLICATIONS
+config NET_SNMP_MIB_MODULES_UCD_SNMP
+ prompt "ucd_snmp"
bool
- prompt "apps (snmpget, ...)"
+ help
+ UCD-SNMP-MIB specific extensions.
-config NET_SNMP_SCRIPTS
+config NET_SNMP_MIB_MODULES_LM_SENSORS
+ prompt "ucd-snmp/lmsensorsMib"
bool
- prompt "scripts (mib2c, ...)"
+ help
+ hardware monitoring (LM-SENSORS-MIB)
+
+config NET_SNMP_MIB_MODULES
+ prompt "additional mib modules"
+ string
+ default ""
+ help
+ space separated list of optional modules
+ tunnel Linux TUNNEL-MIB support (ifTable extension)
+ mibII/interfaces (old ifTable implementation)
+ misc/ipfwacc accounting rules IP firewall information
+ ipfwchains/ipfwchains firewall chains under ipfw
+ sctp-mib support for the SCTP-MIB
+ etherlike-mib support for the EtherLike-MIB
+
+config NET_SNMP_WITHOUT_MIB_MODULES
+ prompt "without these mib modules"
+ string
+ default ""
+ help
+ space separated list of default mib modules compiled into the
+ agent (which can be removed):
+ mibII support for the mib-II tree.
+ snmpv3mibs support for the snmpv3 mib modules.
+ agent_mibs NET-SNMP-AGENT-MIB extensions
+ notification mibs supporting specification of trap destinations.
+ target Support for the SNMP WGs TARGET-MIB.
+ utilities general agent configuration utilities.
+ disman/event support for the DISMAN-EVENT-MIB
+ disman/schedule support for the DISMAN-SCHEDULE-MIB
+ host host resources mib support.
+
+endmenu
menuconfig NET_SNMP_MIBS
bool
@@ -112,6 +147,47 @@ config NET_SNMP_OTHERMIBS
endif
+choice
+ prompt "debugging"
+ default NET_SNMP_DEFAULT_DEBUGGING
+
+config NET_SNMP_DEFAULT_DEBUGGING
+ bool
+ prompt "default"
+ help
+ Use default debugging, selectable via -D on the command-line.
+
+config NET_SNMP_FORCE_DEBUGGING
+ bool
+ prompt "enforce"
+ help
+ Always print all debugging even when not specified on command-line.
+
+config NET_SNMP_STRIP_DEBUGGING
+ bool
+ prompt "strip"
+ help
+ Strip debugging code entirely.
+
+endchoice
+
+config NET_SNMP_MINI_AGENT
+ bool
+ default y
+ prompt "minimal agent"
+
+config NET_SNMP_AGENT
+ bool
+ prompt "agent (snmpd)"
+
+config NET_SNMP_APPLICATIONS
+ bool
+ prompt "apps (snmpget, ...)"
+
+config NET_SNMP_SCRIPTS
+ bool
+ prompt "scripts (mib2c, ...)"
+
config NET_SNMP_MIB_LOADING
bool
prompt "include code that parses and manipulates mib files"
@@ -132,6 +208,14 @@ config NET_SNMP_MD5
bool
prompt "MD5 authentication"
+config NET_SNMP_DOM_SOCK_ONLY
+ bool "Disable UDP/TCP transports for agentx" if NET_SNMP_AGENT
+ default y
+ help
+ Enable this to disable TCP and UDP connections for subagent
+ connections with AgentX protocol. Only unix socket connections are
+ allowed then.
+
config NET_SNMP_SNMPTRAPD
bool
prompt "agentx subagent code in snmptrapd"
@@ -140,30 +224,6 @@ config NET_SNMP_LOCAL_SMUX
bool
prompt "restrict SMUX connections to localhost (by default)"
-choice
- prompt "debugging"
- default NET_SNMP_DEFAULT_DEBUGGING
-
-config NET_SNMP_DEFAULT_DEBUGGING
- bool
- prompt "default"
- help
- Use default debugging, selectable via -D on the command-line.
-
-config NET_SNMP_FORCE_DEBUGGING
- bool
- prompt "enforce"
- help
- Always print all debugging even when not specified on command-line.
-
-config NET_SNMP_STRIP_DEBUGGING
- bool
- prompt "strip"
- help
- Strip debugging code entirely.
-
-endchoice
-
config NET_SNMP_DEVELOPER
bool
prompt "super-duper-extra-compile-warnings using gcc"
@@ -183,58 +243,6 @@ config NET_SNMP_PERSISTENT_DIR
string
default "/var/net-snmp"
-menu "additional mib modules "
-
-config NET_SNMP_MIB_MODULES_AGENTX
- prompt "agentx"
- bool
- help
- AgentX support (includes both agentx/master and agentx/client).
-
-config NET_SNMP_MIB_MODULES_UCD_SNMP
- prompt "ucd_snmp"
- bool
- help
- UCD-SNMP-MIB specific extensions.
-
-config NET_SNMP_MIB_MODULES_LM_SENSORS
- prompt "ucd-snmp/lmsensorsMib"
- bool
- help
- hardware monitoring (LM-SENSORS-MIB)
-
-config NET_SNMP_MIB_MODULES
- prompt "additional mib modules"
- string
- default ""
- help
- space separated list of optional modules
- tunnel Linux TUNNEL-MIB support (ifTable extension)
- mibII/interfaces (old ifTable implementation)
- misc/ipfwacc accounting rules IP firewall information
- ipfwchains/ipfwchains firewall chains under ipfw
- sctp-mib support for the SCTP-MIB
- etherlike-mib support for the EtherLike-MIB
-
-config NET_SNMP_WITHOUT_MIB_MODULES
- prompt "without these mib modules"
- string
- default ""
- help
- space separated list of default mib modules compiled into the
- agent (which can be removed):
- mibII support for the mib-II tree.
- snmpv3mibs support for the snmpv3 mib modules.
- agent_mibs NET-SNMP-AGENT-MIB extensions
- notification mibs supporting specification of trap destinations.
- target Support for the SNMP WGs TARGET-MIB.
- utilities general agent configuration utilities.
- disman/event support for the DISMAN-EVENT-MIB
- disman/schedule support for the DISMAN-SCHEDULE-MIB
- host host resources mib support.
-
-endmenu
-
config NET_SNMP_DEFAULT_MIBS
prompt "default mib id's to read"
string
@@ -249,11 +257,4 @@ config NET_SNMP_MIB_INSTALL_DIR
string
default "/usr/share/snmp/mibs"
-config NET_SNMP_DOM_SOCK_ONLY
- bool "Disable UDP/TCP transports for agentx" if NET_SNMP_AGENT
- default y
- help
- Enable this to disable TCP and UDP connections for subagent
- connections with AgentX protocol. Only unix socket connections are
- allowed then.
endif
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2013-09-20 14:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-20 13:59 [ptxdist] net-snmp: patch series again Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 1/8] net-snmp: improve menu help texts Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 2/8] net-snmp: check mib config by default Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 3/8] net-snmp: enable rewritten mib modules " Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 4/8] net-snmp: added extra menu entries for mib modules Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 5/8] net-snmp: remove no longer used/needed stuff Alexander Dahl
2013-09-20 13:59 ` [ptxdist] [PATCH 6/8] net-snmp: let user choose MIB files to install Alexander Dahl
2013-09-20 13:59 ` Alexander Dahl [this message]
2013-09-20 13:59 ` [ptxdist] [PATCH 8/8] net-snmp: fix vim mode lines Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1379685575-11135-8-git-send-email-post@lespocky.de \
--to=post@lespocky.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox