From 902823fd8f7b0ad2e90558a7b1ab5d44b202546e Mon Sep 17 00:00:00 2001 From: Zeke Gabrielse Date: Thu, 5 Oct 2023 14:38:00 -0500 Subject: [PATCH] readd systemd grep for docker --- machineid/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/machineid/__init__.py b/machineid/__init__.py index 9efaa76..8234057 100644 --- a/machineid/__init__.py +++ b/machineid/__init__.py @@ -86,9 +86,11 @@ def id(winregistry: bool = True) -> str: mountinfo = __read__('/proc/self/mountinfo') if mountinfo: if 'docker' in mountinfo: - id = __exec__("grep '/data/docker/containers' /proc/self/mountinfo | cut -d/ -f5") + id = __exec__("grep '/var/lib/docker/containers' /proc/self/mountinfo | cut -d/ -f6") if not id: - id = __exec__("grep '/var/lib/docker/containers' /proc/self/mountinfo | cut -d/ -f6") + id = __exec__("grep '/data/docker/containers' /proc/self/mountinfo | cut -d/ -f5") + if not id: + id = __exec__("grep 'systemd' /proc/self/mountinfo | cut -d/ -f3") if not id: if 'microsoft' in uname().release: # wsl id = __exec__("powershell.exe -ExecutionPolicy bypass -command '(Get-CimInstance -Class Win32_ComputerSystemProduct).UUID'")