diff options
| author | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-11-15 19:30:43 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil.baturin@vyatta.com> | 2011-11-15 19:30:43 +0700 |
| commit | f7e135d366ba2c67748154e63cfe0ca6bbfe7113 (patch) | |
| tree | aa99398f179a0aeb24c1de94bfccd8a9d061e6bf | |
| parent | 684c6f839eea5422f493caf999e92a56a8b5c5e5 (diff) | |
| download | vyatta-cfg-firewall-f7e135d366ba2c67748154e63cfe0ca6bbfe7113.tar.gz vyatta-cfg-firewall-f7e135d366ba2c67748154e63cfe0ca6bbfe7113.zip | |
Move check-params-on-reboot script for conntrack hash size to
vyatta-conntrack, update automake rules and debian controls
accordingly.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | debian/vyatta-cfg-firewall.install | 1 | ||||
| -rw-r--r-- | debian/vyatta-cfg-firewall.postinst.in | 2 | ||||
| -rwxr-xr-x | scripts/check-params-on-reboot.d/conntrack-hash-size | 20 |
4 files changed, 1 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index 06cf8d4..bd8d923 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,12 @@ cfgdir = $(datadir)/vyatta-cfg/templates share_perl5dir = /opt/vyatta/share/perl5/Vyatta/IpTables curverdir = $(sysconfdir)/config-migrate/current modprobedir = /etc/modprobe.d -checkparamsonrebootdir = $(bindir)/sudo-users/check-params-on-reboot.d modprobe_DATA = etc/modprobe.d/vyatta_xt_recent.conf -checkparamsonreboot_SCRIPTS = sbin_SCRIPTS = curver_DATA = cfg-version/firewall@5 -checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/conntrack-hash-size - sbin_SCRIPTS += scripts/firewall/vyatta-firewall.pl sbin_SCRIPTS += scripts/firewall/firewall.init sbin_SCRIPTS += scripts/firewall/vyatta-ipset.pl @@ -35,4 +31,3 @@ install-exec-hook: mkdir -p $(DESTDIR)$(cfgdir) cd templates; $(cpiop) $(DESTDIR)$(cfgdir); cd .. cd generated-templates; $(cpiop) $(DESTDIR)$(cfgdir); cd .. - diff --git a/debian/vyatta-cfg-firewall.install b/debian/vyatta-cfg-firewall.install index 57cc62b..633b9e0 100644 --- a/debian/vyatta-cfg-firewall.install +++ b/debian/vyatta-cfg-firewall.install @@ -1,5 +1,4 @@ etc/modprobe.d -opt/vyatta/bin/sudo-users/check-params-on-reboot.d opt/vyatta/sbin opt/vyatta/etc opt/vyatta/share/perl5 diff --git a/debian/vyatta-cfg-firewall.postinst.in b/debian/vyatta-cfg-firewall.postinst.in index 462993b..d3cc4b9 100644 --- a/debian/vyatta-cfg-firewall.postinst.in +++ b/debian/vyatta-cfg-firewall.postinst.in @@ -12,7 +12,7 @@ ln -sf /opt/vyatta/sbin/vyatta-ipset.pl ${bindir}/sudo-users/vyatta-ipset.pl # comply with Squeeze version of modprobe # remove old versions of files during upgrade -for modprobe in vyatta_nf_conntrack vyatta_xt_recent vyatta_sip_options +for modprobe in vyatta_xt_recent vyatta_sip_options do if [ -f /etc/modprobe.d/${modprobe} ]; then mv -f /etc/modprobe.d/${modprobe} /etc/modprobe.d/${modprobe}.conf diff --git a/scripts/check-params-on-reboot.d/conntrack-hash-size b/scripts/check-params-on-reboot.d/conntrack-hash-size deleted file mode 100755 index 6b3ba83..0000000 --- a/scripts/check-params-on-reboot.d/conntrack-hash-size +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# fix conntrack-hash-size on reboot -# - -BOOTFILE=$1 -cthash_cfg=$(cli-shell-api cfReturnValue $BOOTFILE firewall conntrack-hash-size) - -if [ -z "$cthash_cfg" ]; then - cthash_cfg=4096 # default hashsize value that Vyatta ships -fi - -if ! grep -q "nf_conntrack hashsize=$cthash_cfg$" \ - /etc/modprobe.d/vyatta_nf_conntrack.conf -then - sudo sh -c "sed -i -e '/options nf_conntrack hashsize/d' \ - /etc/modprobe.d/vyatta_nf_conntrack.conf" - sudo sh -c "echo options nf_conntrack hashsize=$cthash_cfg >> \ - /etc/modprobe.d/vyatta_nf_conntrack.conf" -fi |