diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2016-10-13 15:33:35 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2016-10-13 15:33:35 +0200 |
| commit | 752469137fa1a440a85a29479a71b8d30bfce756 (patch) | |
| tree | 55e540fd41955f3cdc575d8eca24631847cd67b3 /tools | |
| parent | b3f098b002f4b68f0e3d38717bc610da268d0d18 (diff) | |
tools/create-gce-image.sh: add vsyscall=native to cmdline
Required for android as vdso is disabled by default for some reason.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/create-gce-image.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/create-gce-image.sh b/tools/create-gce-image.sh index 9b11e1354..767c9bc6f 100755 --- a/tools/create-gce-image.sh +++ b/tools/create-gce-image.sh @@ -26,7 +26,7 @@ # The image can be tested locally with e.g.: # qemu-system-x86_64 -hda disk.raw -net user,host=10.0.2.10,hostfwd=tcp::10022-:22 -net nic -enable-kvm -m 2G -display none -serial stdio # once the kernel boots, you can ssh into it with: -# ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -p 10022 -i gce.key root@localhost +# ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -p 10022 -i key root@localhost # # Note: the script creates and deletes some failes in cwd. @@ -89,7 +89,7 @@ menuentry 'linux' --class gnu-linux --class gnu --class os { insmod part_msdos insmod ext2 set root='(hd0,1)' - linux /vmlinuz root=/dev/sda1 debug console=ttyS0 earlyprintk=serial ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 panic=86400 + linux /vmlinuz root=/dev/sda1 debug console=ttyS0 earlyprintk=serial vsyscall=native ftrace_dump_on_oops=orig_cpu oops=panic panic_on_warn=1 panic=86400 } EOF sudo grub-install --boot-directory=disk.mnt/boot --no-floppy /dev/nbd0 |