diff options
| author | Marcel Braun <marcel.braun@ost.ch> | 2026-05-12 13:00:02 +0200 |
|---|---|---|
| committer | Marcel Braun <marcel.braun@ost.ch> | 2026-05-12 13:00:02 +0200 |
| commit | 92994a0c662e19bc94a06a544520e8a48bf8f11e (patch) | |
| tree | fd1e83b1ccab6603374f2c134c8a3691b83164c9 /kernel/include | |
| parent | fee33c0b2e2ab91a008bec16e143fba755b51974 (diff) | |
| parent | 91821da0110e05724640903434c3d85fc3d02466 (diff) | |
| download | kernel-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 'kernel/include')
| -rw-r--r-- | kernel/include/kernel/filesystem/vfs.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/include/kernel/filesystem/vfs.hpp b/kernel/include/kernel/filesystem/vfs.hpp index 7e66fb7..b5053a2 100644 --- a/kernel/include/kernel/filesystem/vfs.hpp +++ b/kernel/include/kernel/filesystem/vfs.hpp @@ -1,6 +1,7 @@ #ifndef TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP #define TEACH_OS_KERNEL_FILESYSTEM_VFS_HPP +#include "kernel/filesystem/devfs/filesystem.hpp" #include <kernel/filesystem/dentry.hpp> #include <kernel/filesystem/filesystem.hpp> #include <kernel/filesystem/mount_table.hpp> @@ -80,6 +81,8 @@ namespace kernel::filesystem auto do_mount_internal(kstd::shared_ptr<dentry> const & mount_point_dentry, kstd::shared_ptr<filesystem> const & fs) -> void; + auto graft_persistent_device_fs(kstd::shared_ptr<devfs::filesystem> const & device_fs) -> void; + mount_table m_mount_table; }; } // namespace kernel::filesystem |