fix: user management on classic snap

canonical · Feb 23, 2024 · 948db70 · 948db70
1 parent 3af82ee
commit 948db70
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/landscape/client/__init__.py b/landscape/client/__init__.py
@@ -1,7 +1,7 @@
 import os
 
 IS_SNAP = os.getenv("LANDSCAPE_CLIENT_SNAP")
-IS_CORE = os.getenv("LANDSCAPE_CLIENT_CORE")
+IS_CORE = os.getenv("SNAP_SAVE_DATA") is not None
 
 USER = "root" if IS_SNAP else "landscape"
 GROUP = "root" if IS_SNAP else "landscape"

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -36,14 +36,12 @@ apps:
       - system-observe
     environment:
       LANDSCAPE_CLIENT_SNAP: 1
-      LANDSCAPE_CLIENT_CORE: 1
       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
   config:
     command: usr/bin/landscape-config
     plugs: [network]
     environment:
       LANDSCAPE_CLIENT_SNAP: 1
-      LANDSCAPE_CLIENT_CORE: 1
       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
 
 layout: