fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Disk(Linux): Better subvolume detection

Browse Source 
#396
This commit is contained in:
Linus Dierheimer
2023-01-20 13:28:25 +01:00
parent 1e9ec5424a
commit a71f2142bb
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/disk/disk_linux.c
+10 -9
View File
@@ -29,17 +29,18 @@ static void strbufAppendMountPoint(FFstrbuf* mountpoint, const char* source)
}
#ifndef __ANDROID__
static bool isSubvolume(const char* options)
static bool isSubvolume(const FFlist* allDisks, const FFDisk* currentDisk)
{
const char* prefix = "subvol=/@"; //Btrfs subvolume
const char* subvolume = strstr(options, prefix);
if(subvolume == NULL)
return false;
FF_LIST_FOR_EACH(FFDisk, disk, *allDisks)
{
if(disk == currentDisk)
continue;
subvolume += strlen(prefix);
if(ffStrbufEqual(&disk->mountpoint, &currentDisk->mountpoint))
return true;
}
//If there is no space or comma after the @, it is a btrfs subvolume
return *subvolume != ' ' && *subvolume != ',';
return false;
}
#endif
@@ -104,7 +105,7 @@ void ffDetectDisksImpl(FFDiskResult* disks)
else
disk->type = FF_DISK_TYPE_HIDDEN;
#else
if(isSubvolume(currentPos))
if(isSubvolume(&disks->disks, disk))
disk->type = FF_DISK_TYPE_SUBVOLUME;
else if(strstr(currentPos, "nosuid") != NULL || strstr(currentPos, "nodev") != NULL)
disk->type = FF_DISK_TYPE_EXTERNAL;