Revision: 7090
          http://sourceforge.net/p/ipcop/svn/7090
Author:   dotzball
Date:     2013-07-31 12:33:08 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Moving conntrack kernel settings to second post init sysctl settings file.

Modified Paths:
--------------
    ipcop/trunk/config/etc/sysctl.conf
    ipcop/trunk/config/rootfiles/common/stage2
    ipcop/trunk/src/rc.d/rc.sysinit
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0

Added Paths:
-----------
    ipcop/trunk/config/etc/sysctlpostinit.conf

Modified: ipcop/trunk/config/etc/sysctl.conf
===================================================================
--- ipcop/trunk/config/etc/sysctl.conf  2013-07-30 21:17:59 UTC (rev 7089)
+++ ipcop/trunk/config/etc/sysctl.conf  2013-07-31 12:33:08 UTC (rev 7090)
@@ -25,9 +25,6 @@
 net.ipv4.conf.all.log_martians = 1
 net.ipv4.conf.all.promote_secondaries = 1
 
-# show bytes and packets in conntrack tables
-net.netfilter.nf_conntrack_acct = 1
-
 kernel.printk = 1 4 1 7
 
 # Prevent exploitation of kernel NULL dereference for addr

Added: ipcop/trunk/config/etc/sysctlpostinit.conf
===================================================================
--- ipcop/trunk/config/etc/sysctlpostinit.conf                          (rev 0)
+++ ipcop/trunk/config/etc/sysctlpostinit.conf  2013-07-31 12:33:08 UTC (rev 
7090)
@@ -0,0 +1,2 @@
+# show bytes and packets in conntrack tables
+net.netfilter.nf_conntrack_acct = 1

Modified: ipcop/trunk/config/rootfiles/common/stage2
===================================================================
--- ipcop/trunk/config/rootfiles/common/stage2  2013-07-30 21:17:59 UTC (rev 
7089)
+++ ipcop/trunk/config/rootfiles/common/stage2  2013-07-31 12:33:08 UTC (rev 
7090)
@@ -26,6 +26,7 @@
 etc/rsyslog.conf
 etc/securetty
 etc/sysctl.conf
+etc/sysctlpostinit.conf
 #home
 #home/nobody
 #lib

Modified: ipcop/trunk/src/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/src/rc.d/rc.sysinit     2013-07-30 21:17:59 UTC (rev 7089)
+++ ipcop/trunk/src/rc.d/rc.sysinit     2013-07-31 12:33:08 UTC (rev 7090)
@@ -402,6 +402,10 @@
 /usr/local/bin/openvpnctrl --start
 test_ok
 
+echo -ne "Setting post-init kernel settings ... "
+/sbin/sysctl -e -p /etc/sysctlpostinit.conf >/dev/null
+test_ok
+
 echo "Running rc.event"
 /etc/rc.d/rc.event system up
 

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2013-07-30 21:17:59 UTC 
(rev 7089)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2013-07-31 12:33:08 UTC 
(rev 7090)
@@ -7,6 +7,7 @@
 /etc/rc.d/rc.sysinit
 /etc/rc.d/rc.updatered
 /etc/sysctl.conf
+/etc/sysctlpostinit.conf
 /home/httpd/cgi-bin/aliases.cgi
 /home/httpd/cgi-bin/connections.cgi
 /home/httpd/cgi-bin/credits.cgi

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to