This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, thirteen has been updated via ee9987e89e10e8f1bd13b77ce759e4ade8070235 (commit) via e1c97b8a41046385395ed68ac67f9cea100d4e16 (commit) via fa5b71bf288639f8ea8476cbe21631230e87fe37 (commit) from 01f547269da80deb75c121e6c1ec28230311d7b6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ee9987e89e10e8f1bd13b77ce759e4ade8070235 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 20:30:43 2012 +0100
updater: reinstall grub at update.
commit e1c97b8a41046385395ed68ac67f9cea100d4e16 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 20:24:32 2012 +0100
network initskript: enable netfilter accounting.
commit fa5b71bf288639f8ea8476cbe21631230e87fe37 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 20:04:53 2012 +0100
Revert "sysctl: activate conntrack accounting."
This reverts commit 94ca39b479b1c122294bce9c30d3fbac58ac1738. Cannot set this because nf_conntrack is not loaded yet.
-----------------------------------------------------------------------
Summary of changes: config/etc/sysctl.conf | 2 -- config/rootfiles/core/65/filelists/files | 1 + config/rootfiles/core/65/filelists/i586/grub | 3 +-- config/rootfiles/core/65/update.sh | 6 ++++++ src/initscripts/init.d/network | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) mode change 100644 => 120000 config/rootfiles/core/65/filelists/i586/grub
Difference in files: diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 8e06701..b293457 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -20,8 +20,6 @@ net.ipv4.conf.all.accept_redirects = 0 net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1
-net.netfilter.nf_conntrack_acct = 1 - kernel.printk = 1 4 1 7 vm.swappiness=0 vm.mmap_min_addr = 4096 diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index c7879a6..398d722 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -6,6 +6,7 @@ opt/pakfire/etc/pakfire.conf etc/rc.d/init.d/partresize etc/rc.d/init.d/firewall etc/rc.d/init.d/fsresize +etc/rc.d/init.d/network etc/rc.d/init.d/sendsignals etc/rc.d/init.d/setclock etc/rc.d/init.d/tmpfs diff --git a/config/rootfiles/core/65/filelists/i586/grub b/config/rootfiles/core/65/filelists/i586/grub deleted file mode 100644 index 1fc2d19..0000000 --- a/config/rootfiles/core/65/filelists/i586/grub +++ /dev/null @@ -1,2 +0,0 @@ -#boot/grub -boot/grub/grub.conf diff --git a/config/rootfiles/core/65/filelists/i586/grub b/config/rootfiles/core/65/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index 4854994..024920d 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -191,6 +191,12 @@ else sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf fi + +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck + # # Delete old lm-sensor modullist to force search at next boot # diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 9de3994..9ff2200 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -28,6 +28,9 @@ init_networking() { (exit ${failed}) evaluate_retval
+ # Enable netfilter accounting + sysctl net.netfilter.nf_conntrack_acct=1 > /dev/null + if [ -e /var/ipfire/main/disable_nf_sip ]; then rmmod nf_nat_sip rmmod nf_conntrack_sip
hooks/post-receive -- IPFire 2.x development tree