aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Vanotti <mvanotti@google.com>2020-09-30 10:46:40 -0700
committerMarco Vanotti <mvanotti@users.noreply.github.com>2020-10-01 12:43:24 -0700
commit9602ddf403bdf3cfd87efef14becc76f9a38b81d (patch)
treed476e00beca03b6dc24d0f2d62d0a669470ec17a
parenta3de0c0818bca4aa11cad1414b462b5a0184b17c (diff)
docs/fuchsa: update docs
This commit updates the fuchsia docs to fix the file paths that have moved around, as well as adding an extra step to extend the fvm image.
-rw-r--r--docs/fuchsia/README.md13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/fuchsia/README.md b/docs/fuchsia/README.md
index 62e878914..424db14e1 100644
--- a/docs/fuchsia/README.md
+++ b/docs/fuchsia/README.md
@@ -50,7 +50,14 @@ $ make TARGETOS=fuchsia TARGETARCH=amd64 \
Running syz-manager requires you to have built fuchsia previously, and added the ssh keys to the fuchsia.zbi image:
```
-$ ${SOURCEDIR}/out/x64.zircon/tools/zbi -o ${SOURCEDIR}/out/x64/fuchsia-ssh.zbi ${SOURCEDIR}/out/x64/fuchsia.zbi --entry "data/ssh/authorized_keys=${SOURCEDIR}/.ssh/authorized_keys"
+$ ${SOURCEDIR}/out/x64/host_x64/zbi -o ${SOURCEDIR}/out/x64/fuchsia-ssh.zbi ${SOURCEDIR}/out/x64/fuchsia.zbi --entry "data/ssh/authorized_keys=${SOURCEDIR}/.ssh/authorized_keys"
+```
+
+You will also need to extend the `fvm` image:
+
+```
+$ cp "${SOURCEDIR}/out/x64/obj/build/images/fvm.blk" "${SOURCEDIR}/out/x64/obj/build/images/fvm-extended.blk"
+$ ${SOURCEDIR}/out/x64/host_x64/fvm "${SOURCEDIR}/out/x64/obj/build/images/fvm-extended.blk" extend --length 3G
```
Note: This needs to be repeated after each `fx build`.
@@ -64,7 +71,7 @@ Run `syz-manager` with a config along the lines of:
"workdir": "/workdir.fuchsia",
"kernel_obj": "/fuchsia/out/x64.zircon/kernel-x64-gcc",
"syzkaller": "/syzkaller",
- "image": "/fuchsia/out/x64/obj/build/images/fvm.blk",
+ "image": "/fuchsia/out/x64/obj/build/images/fvm-extended.blk",
"sshkey": "/fuchsia/.ssh/pkey",
"reproduce": false,
"cover": false,
@@ -74,7 +81,7 @@ Run `syz-manager` with a config along the lines of:
"count": 10,
"cpu": 4,
"mem": 2048,
- "kernel": "/fuchsia/out/x64.zircon/multiboot.bin",
+ "kernel": "/fuchsia/out/x64/multiboot.bin",
"initrd": "/fuchsia/out/x64/fuchsia-ssh.zbi"
}
}