diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-07-23 09:59:30 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-07-23 09:59:30 -0400 |
| commit | f911a2b4545f9f0d1cb3be1bb6626db83c5a6392 (patch) | |
| tree | 8fa00efbb6fb92ac7a60e6d8f54304c909507323 /scripts | |
| parent | d7e25a6e3a27eba09f1ed6731d00019698b19243 (diff) | |
| parent | e79b77ed7542fcab9e773960930912b44eb83eb9 (diff) | |
| download | vyatta-conntrack-f911a2b4545f9f0d1cb3be1bb6626db83c5a6392.tar.gz vyatta-conntrack-f911a2b4545f9f0d1cb3be1bb6626db83c5a6392.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-params-on-reboot.d/conntrack-hash-size | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/scripts/check-params-on-reboot.d/conntrack-hash-size b/scripts/check-params-on-reboot.d/conntrack-hash-size index a188e0f..8b7a530 100755 --- a/scripts/check-params-on-reboot.d/conntrack-hash-size +++ b/scripts/check-params-on-reboot.d/conntrack-hash-size @@ -5,28 +5,11 @@ BOOTFILE=$1 -# Obtain firewall config version -version=`grep "=== vyatta-config-version:" $BOOTFILE | sed -n 's/.*\(firewall\@[0-9]\).*/\1/; h; x;p;q' | awk -F '@' '{print $2}'` - -if [ -z $version ]; then - logger -s "Warning: could not determine firewall config version. Conntrack hash size will not be updated." - exit 1 -fi - -if [ $version -ge 5 ]; then - # The config is from oxnard or higher - cthash_cfg=$(cli-shell-api cfReturnValue $BOOTFILE system conntrack hash-size) -else - # The config is from pre-oxnard release - cthash_cfg=$(grep "conntrack-hash-size" /config/config.boot | awk -F ' ' '{print $2}') -fi - -if [ -z "$cthash_cfg" ]; then - cthash_cfg=32768 # default hashsize value that Vyatta ships +if ! cthash_cfg=$($vyos_bin_dir/vyos-config-file-query -f $BOOTFILE --return-value -p "system conntrack hash-size"); then + cthash_cfg=32768 # default hashsize value that Vyatta ships fi -grep -q "nf_conntrack hashsize=$cthash_cfg" /etc/modprobe.d/vyatta_nf_conntrack.conf -if [ $? != 0 ]; 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 nf_conntrack_helper=1 >> /etc/modprobe.d/vyatta_nf_conntrack.conf" +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 nf_conntrack_helper=1 >> /etc/modprobe.d/vyatta_nf_conntrack.conf" fi |