[EGIT] [enlightenment] 01/01: efm: don't automatically add blocks with HintIgnore defined

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to reference refs/pull/81/head
in repository enlightenment.

View the commit online.

commit c2df432f95c94fc917b71bfd5bc88a84e2c36a95
Author: Bertrand Jacquin <bertr...@jacquin.bzh>
AuthorDate: Sat Oct 5 19:32:20 2024 +0100

    efm: don't automatically add blocks with HintIgnore defined
    
    GPT partition with type C12A7328-F81F-11D2-BA4B-00A0C93EC93B or with GPT
    flag 62 (for hidden partition) automatically get detected/mounted by EFM
    when they are not with GVFS or Thunar for example. udisks comes with a
    set of udev rules defining UDISKS_IGNORE property for such partition.
    
    Partition table example where this is reproducible:
    
      $ sfdisk -d /dev/sda
      label: gpt
      device: /dev/sda
      unit: sectors
      first-lba: 2048
      last-lba: 244457438
      sector-size: 512
    
      /dev/sda1 : start=        2048, size=        2048, type=21686148-6449-6E6F-744E-656564454649, uuid=E04A45F9-7AC4-4786-A270-E524017F6334, attrs="NoBlockIOProtocol LegacyBIOSBootable GUID:60,62,63"
      /dev/sda2 : start=        4096, size=     2097152, type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B, uuid=9FE21AE3-2E2E-441F-B4F3-6C2130A8B7A3, attrs="GUID:60,62,63"
      /dev/sda3 : start=     2101248, size=   242354176, type=EBD0A0A2-B9E5-4433-87C0-68B6B72699C7, uuid=46438A9C-4318-498F-BF1A-7598AE4330FC, attrs="NoBlockIOProtocol"
    
    In this case here, ignore partition with such property in
    _e_fm_main_udisks2_volume_block_add().
    
    It also appears there's a mix up between HintIgnore and HintSystem in
    relation with system_internal.
    
    See: https://github.com/storaged-project/udisks/blob/master/data/80-udisks2.rules
    See: https://storaged.org/doc/udisks2-api/latest/gdbus-org.freedesktop.UDisks2.Block.html#gdbus-property-org-freedesktop-UDisks2-Block.HintIgnore
    See: https://storaged.org/doc/udisks2-api/latest/UDisksBlock.html#udisks-block-get-hint-ignore
---
 src/bin/e_fm/e_fm_main_udisks2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index b4f85134c..0e484b943 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -127,13 +127,13 @@ _e_fm_main_udisks2_storage_block_add(E_Storage *s, U2_Block *u2)
 {
    s->media_size = u2->Size;
    eina_stringshare_replace(&s->icon.drive, u2->HintIconName);
-   s->system_internal = u2->HintIgnore;
+   s->system_internal = u2->HintSystem;
 }
 
 static void
 _e_fm_main_udisks2_volume_block_add(E_Volume *v, U2_Block *u2)
 {
-   v->validated = u2->volume && u2->Device && u2->parent && (!u2->HintSystem);
+   v->validated = u2->volume && u2->Device && u2->parent && (!u2->HintSystem) && (!u2->HintIgnore);
    if (!v->validated) return;
    v->size = u2->Size;
    eina_stringshare_replace(&v->udi, u2->Device);


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.