diff options
author | Maciej enczykowski <maze@google.com> | 2019-10-23 15:20:21 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-23 15:20:21 -0700 |
commit | 0c1d4acd94b777957f54a02de9a95220bad68aab (patch) | |
tree | dbf9fa3d8862fb3067093a1b94b9757013c87ee3 | |
parent | 52b1a78b3124759e0ded4a8bbd6156bf571016a2 (diff) | |
parent | 58a814152565f495abd0a9f50d7c22038ffacc41 (diff) | |
download | tests-0c1d4acd94b777957f54a02de9a95220bad68aab.tar.gz |
net_test: add support/documentation for vsyscall=xonly for 5.2+ host
am: 58a8141525
Change-Id: Ieae7e51ad59fbda243624154556d96711244f9a0
-rwxr-xr-x | net/test/run_net_test.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh index 73383d8..5e20bae 100755 --- a/net/test/run_net_test.sh +++ b/net/test/run_net_test.sh @@ -325,13 +325,14 @@ if [ "$ARCH" == "um" ]; then zcat "/boot/config-$(uname -r).gz" || : } 2>/dev/null \ | egrep -q '^CONFIG_LEGACY_VSYSCALL_NONE=y' \ - && ! egrep -q '(^| )vsyscall=(native|emulate)( |$)' /proc/cmdline \ + && ! egrep -q '(^| )vsyscall=(native|emulate|xonly)( |$)' /proc/cmdline \ && { echo -e "\r" echo -e "-----=====-----\r" echo -e "If above you saw a 'net_test.sh[1]: segfault at ...' followed by\r" echo -e "'Kernel panic - not syncing: Attempted to kill init!' then please\r" echo -e "set 'vsyscall=emulate' on *host* kernel command line.\r" + echo -e "On Linux 5.2+ you can instead use the slightly safer 'vsyscall=xonly'.\r" echo -e "(for example via GRUB_CMDLINE_LINUX in /etc/default/grub)\r" echo -e "-----=====-----\r" } |