From 109644ec776b989e425890f651fe1ad854365152 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Fri, 2 Oct 2026 21:18:20 +0800 Subject: [PATCH] Disk (Haiku): fixes `/boot` being removed by `hideFolders` --- src/detection/disk/disk_haiku.cpp | 4 ++++ src/modules/disk/disk.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/detection/disk/disk_haiku.cpp b/src/detection/disk/disk_haiku.cpp index bce8932d6..0bdc0d439 100644 --- a/src/detection/disk/disk_haiku.cpp +++ b/src/detection/disk/disk_haiku.cpp @@ -15,6 +15,10 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks) { continue; } + if (!ffStrSet(fs.device_name)) { + continue; + } + node_ref node(fs.dev, fs.root); BDirectory dir(&node); BPath path(&dir); diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index c9c42e270..a533b450d 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -435,6 +435,8 @@ void ffInitDiskOptions(FFDiskOptions* options) { ffStrbufInit(&options->folders); #if _WIN32 || __APPLE__ || __ANDROID__ ffStrbufInit(&options->hideFolders); +#elif __HAIKU__ + ffStrbufInitS(&options->hideFolders, "/esp"); // /boot on haiku is the system volume #else ffStrbufInitS(&options->hideFolders, "/efi:/boot:/boot/*"); #endif