Merge ~jocave/checkbox-support:fs-usage-vs-type into checkbox-support:master

[Jonathan Cave]

When checking devmapper devices, switch to using the ID_FS_TYPE key and ensure that a filesystem is hosted rather than just eliminating swap partitions. This has the benefit that crypt partitions are also eliminated.

All the tests still pass so there should be no change for existing devices. Tested that works as expected on beta releases of FDE IoT systems (new tests could be added when final partition layout is confirmed).

[Sylvain Pineau (sylvain-pineau)]

LGTM

review: Approve

diff --git a/checkbox_support/parsers/udevadm.py b/checkbox_support/parsers/udevadm.py
index ded5cc7..99486f7 100644
--- a/checkbox_support/parsers/udevadm.py
+++ b/checkbox_support/parsers/udevadm.py
@@ -481,8 +481,8 @@ class UdevadmDevice(object):
                     # we need to report.
                     return "DISK"
                 if '/dev/mapper' in self._environment.get('DEVLINKS', ''):
-                    if "ID_FS_TYPE" in self._environment:
-                        if self._environment["ID_FS_TYPE"] != 'swap':
+                    if "ID_FS_USAGE" in self._environment:
+                        if self._environment["ID_FS_USAGE"] == 'filesystem':
                             return "DISK"
                     else:
                         return "DISK"
@@ -1059,8 +1059,8 @@ class UdevadmParser(object):
 
         # Keep /dev/mapper devices (non swap)
         if '/dev/mapper' in device._environment.get('DEVLINKS', ''):
-            if "ID_FS_TYPE" in device._environment:
-                if device._environment["ID_FS_TYPE"] == 'swap':
+            if "ID_FS_USAGE" in device._environment:
+                if device._environment["ID_FS_USAGE"] != 'filesystem':
                     return True
             return False
 
@@ -1233,8 +1233,8 @@ class UdevadmParser(object):
         for d in self.devices.values():
             if d.category == 'DISK':
                 if '/dev/mapper' in d._environment.get('DEVLINKS', ''):
-                    if "ID_FS_TYPE" in d._environment:
-                        if d._environment["ID_FS_TYPE"] != 'swap':
+                    if "ID_FS_USAGE" in d._environment:
+                        if d._environment["ID_FS_USAGE"] == 'filesystem':
                             dev_mapper_devices.append(d)
                     else:
                         dev_mapper_devices.append(d)