diff options
| author | hagbard <vyosdev@derith.de> | 2019-10-21 09:45:46 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-10-21 09:45:46 -0700 |
| commit | 64fb52a00815d57cb28c66542ee9c2ee1ef12395 (patch) | |
| tree | a1705c55011311981c7d945a76a1e5356b2750cb | |
| parent | 2d461fda831e78107f8aa15d8459050402571297 (diff) | |
| parent | 3a99ea6e9b8ef9ef417d38d1d0bab8d2d2401aa8 (diff) | |
| download | vyatta-cfg-system-64fb52a00815d57cb28c66542ee9c2ee1ef12395.tar.gz vyatta-cfg-system-64fb52a00815d57cb28c66542ee9c2ee1ef12395.zip | |
Merge branch 'current' into equuleus
Auto-merging scripts/rl-system.init
Auto-merging scripts/install/install-image
Auto-merging Jenkinsfile
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | cfg-version/vyos-accel-ppp@2 | 0 | ||||
| -rwxr-xr-x | scripts/install/install-image | 4 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 3c0fbb0a..d7b5df42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -118,6 +118,7 @@ curver_DATA += cfg-version/ntp@1 curver_DATA += cfg-version/webproxy@2 curver_DATA += cfg-version/interfaces@2 curver_DATA += cfg-version/dns-forwarding@2 +curver_DATA += cfg-version/vyos-accel-ppp@2 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/vyos-accel-ppp@2 b/cfg-version/vyos-accel-ppp@2 new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/cfg-version/vyos-accel-ppp@2 diff --git a/scripts/install/install-image b/scripts/install/install-image index ac4d2dec..fecaeed8 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -3,6 +3,10 @@ # source in the functions source /opt/vyatta/sbin/install-functions +if [ -f /etc/profile.d/vyos-system-proxy.sh ] + then . /etc/profile.d/vyos-system-proxy.sh +fi + # export INSTALL_LOG for the scripts invoked export INSTALL_LOG=/tmp/install-$$.log # export PROGRESS_PID for the scripts invoked diff --git a/scripts/rl-system.init b/scripts/rl-system.init index 0af72cd9..c220f49e 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -132,7 +132,7 @@ set_ipv6_params () echo 1 >/proc/sys/net/ipv6/conf/all/forwarding # Increase route table limit - echo 32768 >/proc/sys/net/ipv6/route/max_size + echo 262144 >/proc/sys/net/ipv6/route/max_size # These values all should be disabled for p in accept_source_route accept_redirects |