From d7bb79b6f177e8c58d47695e0ee1a072475463c4 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Tue, 23 Jul 2019 18:59:55 -0700 Subject: [PATCH] ext: Add ext2 and ext3 tiny images. PiperOrigin-RevId: 259657917 --- pkg/sentry/fs/ext/assets/README.md | 24 ++++++++++++++++-------- pkg/sentry/fs/ext/assets/tiny.ext2 | Bin 0 -> 65536 bytes pkg/sentry/fs/ext/assets/tiny.ext3 | Bin 0 -> 65536 bytes pkg/sentry/fs/ext/extent_test.go | 3 ++- 4 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 pkg/sentry/fs/ext/assets/tiny.ext2 create mode 100644 pkg/sentry/fs/ext/assets/tiny.ext3 diff --git a/pkg/sentry/fs/ext/assets/README.md b/pkg/sentry/fs/ext/assets/README.md index b6eac4f40..6f1e81b3a 100644 --- a/pkg/sentry/fs/ext/assets/README.md +++ b/pkg/sentry/fs/ext/assets/README.md @@ -1,19 +1,21 @@ -### Tiny Ext4 Image +### Tiny Ext(2/3/4) Images -The image is of size 64Kb which supports 64 1k blocks and 16 inodes. This is the -smallest size mkfs.ext4 works with. +The images are of size 64Kb which supports 64 1k blocks and 16 inodes. This is +the smallest size mkfs.ext(2/3/4) works with. -This image was generated using the following commands. +These images were generated using the following commands. ```bash -fallocate -l 64K tiny.ext4 -mkfs.ext4 -j tiny.ext4 +fallocate -l 64K tiny.ext$VERSION +mkfs.ext$VERSION -j tiny.ext$VERSION ``` +where `VERSION` is `2`, `3` or `4`. + You can mount it using: ```bash -sudo mount -o loop tiny.ext4 $MOUNTPOINT +sudo mount -o loop tiny.ext$VERSION $MOUNTPOINT ``` `file.txt`, `bigfile.txt` and `symlink.txt` were added to this image by just @@ -21,8 +23,14 @@ mounting it and copying (while preserving links) those files to the mountpoint directory using: ```bash -sudo cp -P {file.txt,symlink.txt,bigfile.txt} $MOUNTPOINT/ +sudo cp -P {file.txt,symlink.txt,bigfile.txt} $MOUNTPOINT ``` The files in this directory mirror the contents and organisation of the files stored in the image. + +You can umount the filesystem using: + +```bash +sudo umount $MOUNTPOINT +``` diff --git a/pkg/sentry/fs/ext/assets/tiny.ext2 b/pkg/sentry/fs/ext/assets/tiny.ext2 new file mode 100644 index 0000000000000000000000000000000000000000..381ade9bf822fe2bb02127ce01bef452638604e6 GIT binary patch literal 65536 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