diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-11-15 13:03:33 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-11-21 14:22:40 +0100 |
| commit | 5de4ef6cb71a4a07492ab0f28b0bb35cb6ab2e21 (patch) | |
| tree | 0deebd8e9d1283d13b58644bd93cb979013a678e /pkg | |
| parent | c7ec2d19f82830161738378f96761b57328eed7a (diff) | |
tools/create-gce-image.sh: move sysctl's to executor
Move the remaining sysctls from image creation scripts into executor.
We have the rest in executor now, and these are captured in reproducers
and are not duplicated.
It seems that ping_group_range was accidentially lost along the way,
re-add it.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/linux_generated.go | 2 | ||||
| -rw-r--r-- | pkg/csource/generated.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkg/build/linux_generated.go b/pkg/build/linux_generated.go index e35428f18..78c55fd79 100644 --- a/pkg/build/linux_generated.go +++ b/pkg/build/linux_generated.go @@ -101,8 +101,6 @@ echo 'ATTR{name}=="vim2m", SYMLINK+="vim2m"' | sudo tee -a disk.mnt/etc/udev/rul echo 'SUBSYSTEMS=="pci", DRIVERS=="i915", SYMLINK+="i915"' | sudo tee -a disk.mnt/etc/udev/rules.d/60-drm.rules -echo "kernel.printk = 7 4 1 3" | sudo tee -a disk.mnt/etc/sysctl.conf -echo "debug.exception-trace = 0" | sudo tee -a disk.mnt/etc/sysctl.conf SYZ_SYSCTL_FILE="${SYZ_SYSCTL_FILE:-}" if [ "$SYZ_SYSCTL_FILE" != "" ]; then cat $SYZ_SYSCTL_FILE | sudo tee -a disk.mnt/etc/sysctl.conf diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 5e234d47a..2c2c7c398 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -9385,6 +9385,9 @@ static void setup_sysctl() {"/proc/sys/kernel/softlockup_all_cpu_backtrace", "1"}, {"/proc/sys/fs/mount-max", "100"}, {"/proc/sys/vm/oom_dump_tasks", "0"}, + {"/proc/sys/debug/exception-trace", "0"}, + {"/proc/sys/kernel/printk", "7 4 1 3"}, + {"/proc/sys/net/ipv4/ping_group_range", "0 65535"}, }; for (size_t i = 0; i < sizeof(files) / sizeof(files[0]); i++) { if (!write_file(files[i].name, files[i].data)) |