diff options
Diffstat (limited to 'dev/kernel/src/FS')
| -rw-r--r-- | dev/kernel/src/FS/OpenHeFS+FileMgr.cc | 4 | ||||
| -rw-r--r-- | dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc b/dev/kernel/src/FS/OpenHeFS+FileMgr.cc index bb87fd67..3ceb2c4f 100644 --- a/dev/kernel/src/FS/OpenHeFS+FileMgr.cc +++ b/dev/kernel/src/FS/OpenHeFS+FileMgr.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ #ifndef __NE_MINIMAL_OS__ -#ifdef __FSKIT_INCLUDES_HEFS__ +#ifdef __FSKIT_INCLUDES_OPENHEFS__ #include <KernelKit/FileMgr.h> #include <KernelKit/HeapMgr.h> @@ -187,5 +187,5 @@ _Output HeFileSystemParser* HeFileSystemMgr::GetParser() noexcept { } } // namespace Kernel -#endif // ifdef __FSKIT_INCLUDES_HEFS__ +#endif // ifdef __FSKIT_INCLUDES_OPENHEFS__ #endif // ifndef __NE_MINIMAL_OS__ diff --git a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc index 3746ebc1..f0f5e81a 100644 --- a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc +++ b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#ifdef __FSKIT_INCLUDES_HEFS__ +#ifdef __FSKIT_INCLUDES_OPENHEFS__ #include <FSKit/OpenHeFS.h> #include <FirmwareKit/EPM.h> @@ -1149,13 +1149,15 @@ STATIC DriveTrait kMountPoint; /// @brief Initialize the OpenHeFS filesystem. /// @return To check its status, see err_local_get(). -Boolean OpenHeFS::fs_init_hefs(Void) noexcept { +Boolean OpenHeFS::fs_init_openhefs(Void) noexcept { kout << "Verifying disk...\r"; kMountPoint = io_construct_main_drive(); - if (kMountPoint.fPacket.fPacketReadOnly == YES) - ke_panic(RUNTIME_CHECK_FILESYSTEM, "Main disk cannot be mounted (read-only media)."); + if (kMountPoint.fPacket.fPacketReadOnly == YES) { + kout << "Main disk cannot be mounted (read-only media).\r"; + return NO; + } HeFileSystemParser parser; @@ -1163,4 +1165,4 @@ Boolean OpenHeFS::fs_init_hefs(Void) noexcept { } } // namespace Kernel -#endif // ifdef __FSKIT_INCLUDES_HEFS__ +#endif // ifdef __FSKIT_INCLUDES_OPENHEFS__ |