From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Thu, 19 Nov 2015 18:18:02 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=98cb3581bb883c7e95ed9e96bea60926ecddfa50;p=config%2Fsamara%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

diff --git a/conf.d/snmpd b/conf.d/snmpd
index 97a1d70..ba8ba66 100644
--- a/conf.d/snmpd
+++ b/conf.d/snmpd
@@ -1,10 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.conf,v 1.8 2006/11/26 21:37:22 cedk Exp $
+# $Id$
 
 # Initial (empty) options.
 SNMPD_FLAGS=""
 
+# Disable smux by default
+SNMPD_FLAGS="${SNMPD_FLAGS} -I -smux"
+
 # Enable connection logging.
 #SNMPD_FLAGS="${SNMPD_FLAGS} -a"
 
diff --git a/conf.d/snmptrapd b/conf.d/snmptrapd
index b6259fc..775f358 100644
--- a/conf.d/snmptrapd
+++ b/conf.d/snmptrapd
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
+# $Id$
 
 # extra flags to pass to snmptrapd
 SNMPTRAPD_FLAGS=""
diff --git a/init.d/snmpd b/init.d/snmpd
index 6b0ca74..6b923dd 100755
--- a/init.d/snmpd
+++ b/init.d/snmpd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd.init.2,v 1.3 2012/10/22 02:57:05 flameeyes Exp $
+# $Id$
 
 SNMPD_PIDFILE="${SNMPD_PIDFILE:-/var/run/snmpd.pid}"
 
diff --git a/init.d/snmptrapd b/init.d/snmptrapd
index fa0f807..27b501a 100755
--- a/init.d/snmptrapd
+++ b/init.d/snmptrapd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.init.2,v 1.2 2012/10/22 02:57:05 flameeyes Exp $
+# $Id$
 
 SNMPTRAPD_PIDFILE="${SNMPTRAPD_PIDFILE:-/var/run/snmptrapd.pid}"