diff --git a/deps/sefs b/deps/sefs index 12b4fbc6..7ad41587 160000 --- a/deps/sefs +++ b/deps/sefs @@ -1 +1 @@ -Subproject commit 12b4fbc6aed7bea1beb60ad121fd28cc96bd7fa4 +Subproject commit 7ad4158794622216e47439534e3a34996f2bbd77 diff --git a/tools/occlum b/tools/occlum index 88421b7c..07be94a9 100755 --- a/tools/occlum +++ b/tools/occlum @@ -386,12 +386,11 @@ cmd_mount() { echo "Start to mount the FS..." LD_LIBRARY_PATH="$SGX_SDK/sdk_libs" "$sefs_cli" \ - --integrity-only \ - "$signed_sefs_cli_lib" \ + --enclave "$signed_sefs_cli_lib" \ + mount \ "$image_fs" \ "$container_fs" \ - "$MNT_POINT" \ - mount + "$MNT_POINT" # After mounting the FS, remove the signed mount tool rm -f "$signed_sefs_cli_lib" diff --git a/tools/occlum_build.mk b/tools/occlum_build.mk index fe2faecd..21980b43 100644 --- a/tools/occlum_build.mk +++ b/tools/occlum_build.mk @@ -136,10 +136,9 @@ $(SECURE_IMAGE): $(IMAGE) $(IMAGE_DIRS) $(IMAGE_FILES) $(SEFS_CLI_SIM) $(SIGNED_ @mkdir -p build/mount/ @LD_LIBRARY_PATH="$(SGX_SDK)/sdk_libs" $(SEFS_CLI_SIM) \ - --integrity-only \ - "$(SIGNED_SEFS_CLI_LIB)" \ - "$(instance_dir)/build/mount/__ROOT" \ - "" \ + --enclave "$(SIGNED_SEFS_CLI_LIB)" \ + zip \ "$(instance_dir)/image" \ - zip + "$(instance_dir)/build/mount/__ROOT" \ + --integrity-only endif