acquire 3.20.dev8__tar.gz → 3.20.dev9__tar.gz

{acquire-3.20.dev8 → acquire-3.20.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acquire
-Version: 3.20.dev8
+Version: 3.20.dev9
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{acquire-3.20.dev8 → acquire-3.20.dev9}/acquire/acquire.py

@@ -1639,24 +1639,26 @@ class Bootbanks(Module):
             "bootbank": "BOOTBANK1",
             "altbootbank": "BOOTBANK2",
         }
-        boot_fs = {}
+        boot_fs = []  # List of tuples of bootbank paths and volume names
 
         for boot_dir, boot_vol in boot_dirs.items():
             dir_path = target.fs.path(boot_dir)
             if dir_path.is_symlink() and dir_path.exists():
                 dst = dir_path.readlink()
-                fs = dst.get().top.fs
-                boot_fs[fs] = boot_vol
-
-        for fs, mountpoint, uuid, _ in iter_esxi_filesystems(target):
-            if fs in boot_fs:
-                name = boot_fs[fs]
-                log.info("Acquiring %s (%s)", mountpoint, name)
-                mountpoint_len = len(mountpoint)
-                base = f"fs/{uuid}:{name}"
-                for path in target.fs.path(mountpoint).rglob("*"):
-                    outpath = path.as_posix()[mountpoint_len:]
-                    collector.collect_path(path, outpath=outpath, base=base)
+                boot_fs.append((dst, boot_vol))
+
+        for _, mountpoint, uuid, _ in iter_esxi_filesystems(target):
+            for bootbank_path, boot_vol in boot_fs:
+                # samefile fails on python 3.9 (https://github.com/fox-it/dissect.target/issues/1289)
+                # but support for 3.9 gets dropped soon
+                if bootbank_path.samefile(target.fs.path(mountpoint)):
+                    log.info("Acquiring %s (%s)", mountpoint, boot_vol)
+                    mountpoint_len = len(mountpoint)
+                    base = f"fs/{uuid}:{boot_vol}"
+                    for path in target.fs.path(mountpoint).rglob("*"):
+                        outpath = path.as_posix()[mountpoint_len:]
+                        collector.collect_path(path, outpath=outpath, base=base)
+                    break
 
 
 @register_module("--esxi")

acquire-3.20.dev9/acquire/version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '3.20.dev9'
+__version_tuple__ = version_tuple = (3, 20, 'dev9')
+
+__commit_id__ = commit_id = 'gfa63abb68'

{acquire-3.20.dev8 → acquire-3.20.dev9}/acquire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acquire
-Version: 3.20.dev8
+Version: 3.20.dev9
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

acquire-3.20.dev8/acquire/version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '3.20.dev8'
-__version_tuple__ = version_tuple = (3, 20, 'dev8')