aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorMarcel Braun <marcel.braun@ost.ch>2026-05-12 13:00:02 +0200
committerMarcel Braun <marcel.braun@ost.ch>2026-05-12 13:00:02 +0200
commit92994a0c662e19bc94a06a544520e8a48bf8f11e (patch)
treefd1e83b1ccab6603374f2c134c8a3691b83164c9 /arch/x86_64
parentfee33c0b2e2ab91a008bec16e143fba755b51974 (diff)
parent91821da0110e05724640903434c3d85fc3d02466 (diff)
downloadkernel-92994a0c662e19bc94a06a544520e8a48bf8f11e.tar.xz
kernel-92994a0c662e19bc94a06a544520e8a48bf8f11e.zip
Merge branch 'mount-unmount-root-fs' into 'develop-BA-FS26'
if the boot_root_fs contains a /dev directory, vfs mounts the devfs onto the existing directory See merge request teachos/kernel!33
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/support/modules/README.md3
-rw-r--r--arch/x86_64/support/modules/ext2_2KB_fs.img2
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86_64/support/modules/README.md b/arch/x86_64/support/modules/README.md
index 1a29ce5..6d235a7 100644
--- a/arch/x86_64/support/modules/README.md
+++ b/arch/x86_64/support/modules/README.md
@@ -40,6 +40,9 @@ The ext2_4KB_fs image is intentionally fragmented, as some files were created an
(ext2 filesystem 4KB Block size)
.
./lost+found
+./dev
+./dev/image_1.txt
+./dev/image_2.txt
./snake_1.txt
./snake_2.txt
./petting_zoo/goat_1.txt
diff --git a/arch/x86_64/support/modules/ext2_2KB_fs.img b/arch/x86_64/support/modules/ext2_2KB_fs.img
index 8327022..7f297f0 100644
--- a/arch/x86_64/support/modules/ext2_2KB_fs.img
+++ b/arch/x86_64/support/modules/ext2_2KB_fs.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a1d102f2e40083613060d43b2b32d31031137bbef99761a2d1bf4d38e155adb7
+oid sha256:6d9e872916e7d9107b321cc007e151899d5f19400a694666c0b24d482aef61ca
size 5242880