v2: - Check if shared folder exists before enabling it in FVP - Pass additional user flags through to FVP --- README.md | 10 +++++++++- usr/bin/morello | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md index f83c799..4d90167 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Create the following workspace structure: ``` workspace/ |-> morello/ + |-> shared_folder/ |-> docker-compose.yml ```
@@ -118,6 +119,12 @@ Username: root Password: morello ```
+## Shared Folder +To mount the shared folder to share files between host and FVP: +``` +$ mount -t 9p -o trans=virtio,version=9p2000.L FM shared_folder +``` + ## Shutdown the FVP Model
To shutdown the FVP correctly type on a root shell: @@ -144,4 +151,5 @@ $ docker image prune
# Container verification
-morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory. \ No newline at end of file +morello-linux generated containers are signed using [cosign](https://github.com/sigstore/cosign). To verify the validity of a container before donwloading it please follow the information contained in the [.cosign](.cosign/README.md) directory. + diff --git a/usr/bin/morello b/usr/bin/morello index f7a515a..8efedeb 100755 --- a/usr/bin/morello +++ b/usr/bin/morello @@ -16,4 +16,8 @@ export OUTPUT_DIR=/morello/logs
mkdir -p $OUTPUT_DIR
-morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img +if [[ -d "/morello/shared_folder/" ]]; then + ENABLE_SHARED_FOLDER="-v /morello/shared_folder" +fi + +morello-run.sh -f distro -i /usr/share/morello/images/morello-fvp/morello-fvp.img $ENABLE_SHARED_FOLDER $@