diff options
| author | Runar Borge <runar@borge.nu> | 2019-01-09 13:49:30 +0100 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-01-09 13:49:30 +0100 |
| commit | 57474b220e251b071a1d5f6e67ff6f2057870f07 (patch) | |
| tree | c005b1b453d8d2b683bce69556108bd75b44f094 | |
| parent | 830146d03fc1c5e6bc132d5fd0db400fb87309e5 (diff) | |
| parent | 341531360338ee2642b297f839c2c4644ac1b64d (diff) | |
| download | vyos-build-57474b220e251b071a1d5f6e67ff6f2057870f07.tar.gz vyos-build-57474b220e251b071a1d5f6e67ff6f2057870f07.zip | |
Merge remote-tracking branch 'upstream/current' into current and merge conflict fix
| -rwxr-xr-x | data/live-build-config/hooks/live/08-sysconf.chroot | 4 | ||||
| -rwxr-xr-x | scripts/build-submodules | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/data/live-build-config/hooks/live/08-sysconf.chroot b/data/live-build-config/hooks/live/08-sysconf.chroot index 8d1616c0..d403d04b 100755 --- a/data/live-build-config/hooks/live/08-sysconf.chroot +++ b/data/live-build-config/hooks/live/08-sysconf.chroot @@ -38,6 +38,10 @@ update_sysctl_conf net.ipv4.ip_forward 1 \ # "enable ipv6 forwarding" update_sysctl_conf net.core.rmem_max 223232 \ "maximize netlink buffers" +update_sysctl_conf net.ipv4.conf.all.send_redirects 0 \ + "disable IPv4 ICMP redirects" +update_sysctl_conf net.ipv4.conf.default.send_redirects 0 \ + "disable IPv4 ICMP redirects" # Local Variables: # mode: shell-script diff --git a/scripts/build-submodules b/scripts/build-submodules index d58a84c8..4e790eda 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -247,8 +247,7 @@ build_accel-ppp() { fi if [ ! -f "packages/vyos-kernel/Makefile" ]; then - status_fail - error_msg "No Makefile found in kernel package" + error_msg "Something wrong with the kernel module?" return 1 fi |