diff options
| author | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-12 15:09:55 -0800 |
|---|---|---|
| committer | Gaurav Sinha <gaurav.sinha@vyatta.com> | 2011-12-12 15:09:55 -0800 |
| commit | bc5c07ad826ed056bb42fa73c4d39621220efc7e (patch) | |
| tree | 503b852f244b9964d84b398981ba180a0c7a4bf0 | |
| parent | 19f5db65be2577e529a30b3215df1aef6d9117b6 (diff) | |
| parent | a468a3b2886079614311253079e003573698900d (diff) | |
| download | vyatta-conntrack-bc5c07ad826ed056bb42fa73c4d39621220efc7e.tar.gz vyatta-conntrack-bc5c07ad826ed056bb42fa73c4d39621220efc7e.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-conntrack into oxnard
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rwxr-xr-x | scripts/check-params-on-reboot.d/conntrack-hash-size | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright index 8262ab8..cdb8d7d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,5 +32,5 @@ You can also obtain it by writing to the Free Software Foundation, Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -The Debian packaging is (C) 2007, Daniil Baturin <daniil.baturin@vyatta.com> and +The Debian packaging is (C) 2011, Daniil Baturin <daniil.baturin@vyatta.com> and is licensed under the GPL, see above. diff --git a/scripts/check-params-on-reboot.d/conntrack-hash-size b/scripts/check-params-on-reboot.d/conntrack-hash-size index a2063cb..4849bda 100755 --- a/scripts/check-params-on-reboot.d/conntrack-hash-size +++ b/scripts/check-params-on-reboot.d/conntrack-hash-size @@ -7,6 +7,12 @@ BOOTFILE=$1 # Obtain firewall config version version=`tail -n 2 $BOOTFILE | sed -n 's/.*\(firewall\@[0-9]\).*/\1/; h; x;p;q' | awk -F '@' '{print $2}'` + +if [ -z $version ]; then + echo "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) |