diff options
| author | Robert Bays <rbays@moresby.vyatta.com> | 2008-06-05 17:20:25 -0700 |
|---|---|---|
| committer | Robert Bays <rbays@moresby.vyatta.com> | 2008-06-05 17:20:25 -0700 |
| commit | 7d216f5ca693050e62304fceedf69141b993853b (patch) | |
| tree | bb55aa0f6f55bca6fd4e1fa007aebcf716356829 | |
| parent | 8373d3a4ff52fcbd986d7cc5aa37596cd6560028 (diff) | |
| parent | a7bd26d39049cf3ac5579b47f1732f07a53f92a4 (diff) | |
| download | vyatta-cfg-system-7d216f5ca693050e62304fceedf69141b993853b.tar.gz vyatta-cfg-system-7d216f5ca693050e62304fceedf69141b993853b.zip | |
Merge branch 'hollywood' of git://git.vyatta.com/vyatta-cfg-system into hollywood
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | sysconf/vyatta-sysctl.conf | 3 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/shell/node.def | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 86879a7b..d0e6ed59 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Depends: sed (>= 4.1.5), grub-pc, whois, sudo, - snmpd, + vyatta-snmpd | snmpd, vyatta-keepalived | keepalived, bridge-utils, ssh, diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf index 73c4c8ff..cb03a614 100644 --- a/sysconf/vyatta-sysctl.conf +++ b/sysconf/vyatta-sysctl.conf @@ -21,3 +21,6 @@ net.ipv4.icmp_ignore_bogus_error_responses=1 # Send ICMP responses with primary address of exiting interface net.ipv4.icmp_errors_use_inbound_ifaddr=1 + +# Turn off SACK since it causes problems with MD5 due to lack of options space +net.ipv4.tcp_sack=0 diff --git a/templates/system/login/user/node.tag/shell/node.def b/templates/system/login/user/node.tag/shell/node.def new file mode 100644 index 00000000..b1163fdf --- /dev/null +++ b/templates/system/login/user/node.tag/shell/node.def @@ -0,0 +1,8 @@ +type: txt +help: Set command shell +default: fusioncli +syntax:expression: ( $VAR(@) in "fusioncli" "linux" || + exec "if [ -x $VAR(@) -a grep -q $VAR(@) /etc/shells ]; then exit 0; \ + else echo 'Not a valid command shell'; exit 1; fi" +allowed: echo "fusioncli linux" + awk '! /^[ ]*#/ { printf "%s ", $0 }' </etc/shells |